1 --- tortoisehg-0.4.0~rc2/hggtk/shlib.py	2008-05-29 00:37:24.000000000 -0400

     2 +++ tortoisehg-test/hggtk/shlib.py	2008-05-28 13:42:21.000000000 -0400

     3 @@ -135,15 +135,7 @@

     4      # The context menu should set this variable

     5      var = os.environ.get('THG_ICON_PATH', None)

     6      paths = var and [ var ] or []

     7 -    try:

     8 -        # Else try relative paths from hggtk, the repository layout

     9 -        dir = os.path.dirname(__file__)

    10 -        paths.append(os.path.join(dir, '..', 'icons'))

    11 -        # ... or the source installer layout

    12 -        paths.append(os.path.join(dir, '..', '..', '..',

    13 -            'share', 'tortoisehg', 'icons'))

    14 -    except NameError: # __file__ is not always available

    15 -        pass

    16 +    paths.append('/usr/share/pixmaps/tortoisehg/icons')

    17      for p in paths:

    18          path = os.path.join(p, 'tortoise', icon)

    19          if os.path.isfile(path):