Merge lp:~markuz/gwibber/trunk into lp:~gwibber-committers/gwibber/trunk.merge.backup

[markuz]

[markuz (markuz)]

Try to fix bug # 407733

[markuz (markuz)]

This change will make gwibber look from this:

http://www.flickr.com/photos/markuz/3867035983/

To this:

http://www.flickr.com/photos/markuz/3880040980/

[Ken VanDine (ken-vandine)]

I tried this out, it does fix the rendering of some of the icons, at least they aren't huge. But it makes the other icons a bit bigger than they were and look fuzzy. Thanks

review: Needs Fixing

Unmerged revisions

401. By markuz on 2009-09-02

* Try to fix bug #407733 https://bugs.launchpad.net/gwibber/+bug/407733
  by setting the icons to 22x22 px.

=== modified file 'gwibber/gwui.py'
--- gwibber/gwui.py	2009-09-01 04:42:03 +0000
+++ gwibber/gwui.py	2009-09-02 00:28:39 +0000
@@ -108,8 +108,9 @@
     aname = (acct["username"] or "None").capitalize()
     apath = "/gwibber/%s/%s" % (acct["protocol"], acct["id"])
     aicon = resources.get_ui_asset("icons/%s.png" % acct["protocol"])
-
-    ti = self.append(None, [aname, apath, acct["id"], None, pbfile(aicon), None, None])
+    pixbuf = pbfile(aicon)
+    pixbuf = pixbuf.scale_simple(22, 22, gtk.gdk.INTERP_BILINEAR)
+    ti = self.append(None, [aname, apath, acct["id"], None, pixbuf, None, None])
 
     tree_features = [self.features[f] for f in
       self.protocols[acct["protocol"]]["features"]
@@ -120,7 +121,10 @@
         apath = "/gwibber/%s/%s/%s" % (acct["protocol"], acct["id"], f["stream"])
         aname = f["stream"].capitalize()
         aicon = resources.icon(f["icon"], use_theme=False) or resources.get_ui_asset("icons/%s.png" % f["icon"])
-        self.append(ti, [aname, apath, acct["id"], f["name"], pbfile(aicon), None, None])
+        pixbuf = pbfile(aicon)
+        pixbuf = pixbuf.scale_simple(22, 22, gtk.gdk.INTERP_BILINEAR)
+
+        self.append(ti, [aname, apath, acct["id"], f["name"], pixbuf, None, None])
 
     return ti
 
@@ -152,6 +156,7 @@
     for n, i in toplevel.items():
       icf = resources.icon(i, use_theme=False) or resources.get_ui_asset("icons/%s.png" % i)
       icon = pbfile(icf)
+      icon = icon.scale_simple(22, 22, gtk.gdk.INTERP_BILINEAR)
       self.append(None, [n.capitalize(), n, None, None, icon, None, None])
 
     for acct in self.accounts: self.add_account(acct)