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

[Ken VanDine]

Cancel async image loading on tile reset (LP: #911619)

[dobey (dobey)]

Not sure why you commented out the debug logging message, but the cancellable.cancel call looks ok to me. :)

review: Approve

=== modified file 'libgwibber-gtk/stream-view-tile.vala'
--- libgwibber-gtk/stream-view-tile.vala	2011-12-08 22:04:59 +0000
+++ libgwibber-gtk/stream-view-tile.vala	2012-01-05 21:22:24 +0000
@@ -399,6 +399,7 @@
                              string _comments)
     {
       // hide and reset values to prevent reuse as the tiles change
+      cancellable.cancel ();
       icon.hide ();
       action_box.hide ();
       action_box.set_no_show_all (true);
@@ -776,8 +777,7 @@
           pixbuf.save (cimage, t);
         }
       } catch (Error e) {
-        debug("Error trying to load %s: %s", url, e.message);
-        cicon.set_from_icon_name ("stock_person", Gtk.IconSize.DIALOG);
+        //debug("Error trying to load %s: %s", url, e.message);
       }
     }