Gwibber

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

  1. cancel_async_ops
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Merged at revision: 1233
Proposed branch: lp:~ken-vandine/gwibber/cancel_async_ops
Merge into: lp:gwibber
Diff against target: 20 lines (+2/-2)
1 file modified
libgwibber-gtk/stream-view-tile.vala (+2/-2)
To merge this branch: bzr merge lp:~ken-vandine/gwibber/cancel_async_ops
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+87680@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgwibber-gtk/stream-view-tile.vala'
2--- libgwibber-gtk/stream-view-tile.vala 2011-12-08 22:04:59 +0000
3+++ libgwibber-gtk/stream-view-tile.vala 2012-01-05 21:22:24 +0000
4@@ -399,6 +399,7 @@
5 string _comments)
6 {
7 // hide and reset values to prevent reuse as the tiles change
8+ cancellable.cancel ();
9 icon.hide ();
10 action_box.hide ();
11 action_box.set_no_show_all (true);
12@@ -776,8 +777,7 @@
13 pixbuf.save (cimage, t);
14 }
15 } catch (Error e) {
16- debug("Error trying to load %s: %s", url, e.message);
17- cicon.set_from_icon_name ("stock_person", Gtk.IconSize.DIALOG);
18+ //debug("Error trying to load %s: %s", url, e.message);
19 }
20 }
21