[alacarte] util: Fix get_icon

[Jasper St. Pierre <jstpierre src gnome org>]

commit 7e5915df09fa38e2b702a351b2291f72a7549167
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue May 1 16:51:42 2012 -0400

    util: Fix get_icon

 Alacarte/util.py |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/Alacarte/util.py b/Alacarte/util.py
index 91af674..c491c4d 100644
--- a/Alacarte/util.py
+++ b/Alacarte/util.py
@@ -159,8 +159,8 @@ def getUserMenuXml(tree):
     return menu_xml
 
 def getIcon(item):
-    pixbuf, path = None, None
-    if item == None:
+    pixbuf = None
+    if item is None:
         return None
 
     if isinstance(item, GMenu.TreeDirectory):
@@ -170,22 +170,11 @@ def getIcon(item):
         gicon = app_info.get_icon()
 
     icon_theme = Gtk.IconTheme.get_default()
-    try:
-        info = icon_theme.lookup_by_gicon(icon_theme, gicon, 24, 0)
-        pixbuf = icon.load_icon()
-        path = info.get_filename()
-    except:
-        if pixbuf is None:
-            if isinstance(item, GMenu.TreeDirectory):
-                iconName = 'gnome-fs-directory'
-            else:
-                iconName = 'application-default-icon'
-            try:
-                pixbuf = icon_theme.load_icon(iconName, 24, 0)
-                path = icon_theme.lookup_icon(iconName, 24, 0).get_filename()
-            except:
-                return None
-    if pixbuf == None:
+    info = icon_theme.lookup_by_gicon(gicon, 24, 0)
+    if info is None:
+        return None
+    pixbuf = info.load_icon()
+    if pixbuf is None:
         return None
     if pixbuf.get_width() != 24 or pixbuf.get_height() != 24:
         pixbuf = pixbuf.scale_simple(24, 24, GdkPixbuf.InterpType.HYPER)