Merge lp:~ken-vandine/gwibber/lp_940182 into lp:gwibber

[Ken VanDine]

Can errors for creating the pixbuf separately from sending the notification (LP: #940182)

[lp:~ken-vandine/gwibber/lp_940182]

1326. By Ken VanDine on 2012-03-30

only try to set the notification pixbuf if we have a valid pixbuf

[David Klasinc (bigwhale)]

Looks ok.

review: Approve

=== modified file 'gwibber/microblog/util/__init__.py'
--- gwibber/microblog/util/__init__.py	2012-03-20 16:31:03 +0000
+++ gwibber/microblog/util/__init__.py	2012-03-30 14:32:22 +0000
@@ -230,13 +230,19 @@
     
     notification = Notify.Notification.new(title, text, "gwibber")
 
+    pixbuf = None
     try:
       pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(icon, iconsize, iconsize)
-      notification.set_icon_from_pixbuf(pixbuf)
     except GLib.Error as e:
       logger.error("Avatar failure - %s - %s", icon, e.message)
       resources.del_avatar(icon)
 
+    if pixbuf:
+      try:
+        notification.set_icon_from_pixbuf(pixbuf)
+      except GLib.Error as e:
+        logger.error("Notification failure - %s", e.message)
+
     if timeout:
       notification.set_timeout(timeout)