pitivi r1437 - trunk/pitivi/ui

[edwardrv svn gnome org]

Author: edwardrv
Date: Tue Dec  2 14:10:21 2008
New Revision: 1437
URL: http://svn.gnome.org/viewvc/pitivi?rev=1437&view=rev

Log:
Fix SourceList._getIcon so that it does load fallbacks.

Fixes #535374.

Patch by Alessandro Decina <alessandro dot d at gmail dot con>

Modified:
   trunk/pitivi/ui/sourcelist.py

Modified: trunk/pitivi/ui/sourcelist.py
==============================================================================
--- trunk/pitivi/ui/sourcelist.py	(original)
+++ trunk/pitivi/ui/sourcelist.py	Tue Dec  2 14:10:21 2008
@@ -31,6 +31,7 @@
 from pitivi.signalgroup import SignalGroup
 from gettext import gettext as _
 from urllib import unquote
+import os
 
 (COL_ICON,
  COL_INFOTEXT,
@@ -235,7 +236,9 @@
         icon = None
         try:
             icon = icontheme.load_icon(iconname, 32, 0)
-        finally:
+        except:
+            # empty except clause is bad but load_icon raises gio.Error.
+            # Right, *gio*.
             if not icon:
                 icon = gtk.gdk.pixbuf_new_from_file(os.path.join(pixdir, alternate))
         return icon