--- tortoisehg-0.4.0~rc2/hggtk/shlib.py 2008-05-29 00:37:24.000000000 -0400
+++ tortoisehg-test/hggtk/shlib.py 2008-05-28 13:42:21.000000000 -0400
@@ -135,15 +135,7 @@
# The context menu should set this variable
var = os.environ.get('THG_ICON_PATH', None)
paths = var and [ var ] or []
- try:
- # Else try relative paths from hggtk, the repository layout
- dir = os.path.dirname(__file__)
- paths.append(os.path.join(dir, '..', 'icons'))
- # ... or the source installer layout
- paths.append(os.path.join(dir, '..', '..', '..',
- 'share', 'tortoisehg', 'icons'))
- except NameError: # __file__ is not always available
- pass
+ paths.append('/usr/share/pixmaps/tortoisehg/icons')
for p in paths:
path = os.path.join(p, 'tortoise', icon)
if os.path.isfile(path):