Merge lp:~ilkka/gwibber/gtk-find-icon-loading-fix into lp:gwibber

[Ilkka Laukkanen]

[Ilkka Laukkanen (ilkka)]

This is a fix for #427249. By using the builtin gtk-find icon of the default icon theme, a crash is avoided in Karmic's KDE.

[Ilkka Laukkanen (ilkka)]

This supersedes the old proposal at https://code.edge.launchpad.net/~ilkka/gwibber/gtk-find-icon-loading-fix/+merge/13805.

=== modified file 'gwibber/gwui.py'
--- gwibber/gwui.py	2009-10-22 11:43:06 +0000
+++ gwibber/gwui.py	2009-10-27 06:55:17 +0000
@@ -158,8 +158,8 @@
       self.append(None, [n.capitalize(), n, None, None, icon, None, None])
 
     for acct in self.accounts: self.add_account(acct)
-      
-    icon = pbfile(resources.icon("gtk-find", use_theme=False))
+    
+    icon = gtk.icon_theme_get_default().lookup_icon("gtk-find", gtk.ICON_SIZE_SMALL_TOOLBAR, gtk.ICON_LOOKUP_USE_BUILTIN).get_builtin_pixbuf()
     self.search_item = self.append(None, ["Search", "search", None, None, icon, None, None])
 
   def add_errors(self):
@@ -169,7 +169,7 @@
 
   def add_search(self, query, feature="search"):
     pbfile = gtk.gdk.pixbuf_new_from_file
-    icon = pbfile(resources.icon("gtk-find", use_theme=False))
+    icon = gtk.icon_theme_get_default().lookup_icon("gtk-find", gtk.ICON_SIZE_SMALL_TOOLBAR, gtk.ICON_LOOKUP_USE_BUILTIN).get_builtin_pixbuf()
     path = "/gwibber/%s/%s" % (feature, query)
     opid = "search-%s" % query
     ti = self.append(self.search_item, [query, path, None, feature, icon, True, opid])