Avoid errors with incomplete icon themes (LP bug 782303)

gpodder · May 14, 2011 · 717b417 · 717b417
1 parent d56149a
commit 717b417
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/gpodder/gtkui/desktop/deviceplaylist.py b/src/gpodder/gtkui/desktop/deviceplaylist.py
@@ -46,7 +46,11 @@ def new(self):
         self.playlist_file = os.path.join(self.mountpoint,
                                           self._config.mp3_player_playlist_file)
         icon_theme = gtk.icon_theme_get_default()
-        self.icon_new = icon_theme.load_icon(gtk.STOCK_NEW, 16, 0)
+        try:
+            self.icon_new = icon_theme.load_icon(gtk.STOCK_NEW, 16, 0)
+        except Exception, e:
+            log('Icon missing from theme: %s', gtk.STOCK_NEW, sender=self)
+            self.icon_new = None
 
         # add column two
         check_cell = gtk.CellRendererToggle()

diff --git a/src/gpodder/gtkui/desktop/trayicon.py b/src/gpodder/gtkui/desktop/trayicon.py
@@ -64,7 +64,8 @@ def __init__(self, gp, icon_filename, config):
             self.__icon = gtk.gdk.pixbuf_new_from_file(self.__icon_filename)
         except Exception, exc:
             log('Warning: Cannot load gPodder icon, will use the default icon (%s)', exc, sender=self)
-            self.__icon = gtk.icon_theme_get_default().load_icon(gtk.STOCK_DIALOG_QUESTION, 30, 30)
+            self.__icon = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, 30, 30)
+            self.__icon.fill(0xFF00007F)
 
         # Reset trayicon (default icon, default tooltip)
         self.__current_pixbuf = None