diff options
Diffstat (limited to 'deskutils/gdesklets-starterbar/files/StarterBar::Icon.py')
| -rw-r--r-- | deskutils/gdesklets-starterbar/files/StarterBar::Icon.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py b/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py index fbe820f00c47..5476d4cf80c1 100644 --- a/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py +++ b/deskutils/gdesklets-starterbar/files/StarterBar::Icon.py @@ -1,5 +1,5 @@ ---- StarterBar/Icon.py.orig Wed Sep 24 14:26:55 2003 -+++ StarterBar/Icon.py Wed Sep 24 14:28:22 2003 +--- StarterBar/Icon.py.orig Sun Nov 9 16:13:33 2003 ++++ StarterBar/Icon.py Sun Nov 9 16:14:28 2003 @@ -11,7 +11,7 @@ __GNOME_PIXMAP_DIR = \ os.path.join( @@ -9,15 +9,17 @@ # the unknown icon __UNKNOWN_ICON = "gnome-unknown.png" -@@ -61,7 +61,10 @@ - return os.path.join(self.__GNOME_PIXMAP_DIR, f) - #end for - -- return os.path.join(self.__GNOME_PIXMAP_DIR, self.__UNKNOWN_ICON) -+ return os.path.join( -+ commands.getoutput("dirname `which gnome-desktop-item-edit`"), -+ "..", "share", "icons", "gnome", "48x48", "apps", -+ self.__UNKNOWN_ICON) - - +@@ -34,9 +34,10 @@ + def __load_icon(self, desktopfile): + + reader = DesktopReader(desktopfile) +- iconname = reader.get_icon() +- self.__pixmap = self.__icon_theme.lookup_icon(iconname) +- if (not self.__pixmap): ++ try: ++ iconname = reader.get_icon() ++ self.__pixmap = self.__icon_theme.lookup_icon(iconname) ++ except: + self.__pixmap = self.__icon_theme.lookup_icon(self.__UNKNOWN_ICON) + try: |