Gwibber

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

  1. gtk-find-icon-loading-fix
  2. Merge into trunk
Proposed by Ilkka Laukkanen
Status: Merged
Merge reported by: Ryan Paul
Merged at revision: not available
Proposed branch: lp:~ilkka/gwibber/gtk-find-icon-loading-fix
Merge into: lp:gwibber
Diff against target: 23 lines
1 file modified
gwibber/gwui.py (+3/-3)
To merge this branch: bzr merge lp:~ilkka/gwibber/gtk-find-icon-loading-fix
Reviewer Review Type Date Requested Status
gwibber-committers Pending
Review via email: mp+14011@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ilkka Laukkanen (ilkka) wrote :

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.

Revision history for this message
Ilkka Laukkanen (ilkka) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
158 self.append(None, [n.capitalize(), n, None, None, icon, None, None])158 self.append(None, [n.capitalize(), n, None, None, icon, None, None])
159159
160 for acct in self.accounts: self.add_account(acct)160 for acct in self.accounts: self.add_account(acct)
161 161
162 icon = pbfile(resources.icon("gtk-find", use_theme=False))162 icon = gtk.icon_theme_get_default().lookup_icon("gtk-find", gtk.ICON_SIZE_SMALL_TOOLBAR, gtk.ICON_LOOKUP_USE_BUILTIN).get_builtin_pixbuf()
163 self.search_item = self.append(None, ["Search", "search", None, None, icon, None, None])163 self.search_item = self.append(None, ["Search", "search", None, None, icon, None, None])
164164
165 def add_errors(self):165 def add_errors(self):
@@ -169,7 +169,7 @@
169169
170 def add_search(self, query, feature="search"):170 def add_search(self, query, feature="search"):
171 pbfile = gtk.gdk.pixbuf_new_from_file171 pbfile = gtk.gdk.pixbuf_new_from_file
172 icon = pbfile(resources.icon("gtk-find", use_theme=False))172 icon = gtk.icon_theme_get_default().lookup_icon("gtk-find", gtk.ICON_SIZE_SMALL_TOOLBAR, gtk.ICON_LOOKUP_USE_BUILTIN).get_builtin_pixbuf()
173 path = "/gwibber/%s/%s" % (feature, query)173 path = "/gwibber/%s/%s" % (feature, query)
174 opid = "search-%s" % query174 opid = "search-%s" % query
175 ti = self.append(self.search_item, [query, path, None, feature, icon, True, opid])175 ti = self.append(self.search_item, [query, path, None, feature, icon, True, opid])