| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
| Thu, 17 Jul 2008 18:21:43 +0200 | |
| changeset 2 | 7c3fd5a4003d |
| parent 0 | 8c87dc646df3 |
| permissions | -rw-r--r-- |
|
2
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
1 |
diff --git a/hggtk/shlib.py b/hggtk/shlib.py |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
2 |
--- a/hggtk/shlib.py |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
3 |
+++ b/hggtk/shlib.py |
|
0
8c87dc646df3
import from gpoo
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
4 |
@@ -135,15 +135,7 @@ |
|
2
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
5 |
# The context menu should set this variable |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
6 |
var = os.environ.get('THG_ICON_PATH', None)
|
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
7 |
paths = var and [ var ] or [] |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
8 |
- try: |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
9 |
- # Else try relative paths from hggtk, the repository layout |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
10 |
- dir = os.path.dirname(__file__) |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
11 |
- paths.append(os.path.join(dir, '..', 'icons')) |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
12 |
- # ... or the source installer layout |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
13 |
- paths.append(os.path.join(dir, '..', '..', '..', |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
14 |
- 'share', 'tortoisehg', 'icons')) |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
15 |
- except NameError: # __file__ is not always available |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
16 |
- pass |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
17 |
+ paths.append('/usr/share/pixmaps/tortoisehg/icons')
|
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
18 |
for p in paths: |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
19 |
path = os.path.join(p, 'tortoise', icon) |
|
7c3fd5a4003d
refreshed patches using mq
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
0
diff
changeset
|
20 |
if os.path.isfile(path): |