Merge lp:~kelemeng/gwibber/bug926665 into lp:gwibber

Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 1282
Proposed branch: lp:~kelemeng/gwibber/bug926665
Merge into: lp:gwibber
Diff against target: 33 lines (+3/-2)
2 files modified
libgwibber-gtk/stream-view-tile.vala (+2/-2)
po/POTFILES.in (+1/-0)
To merge this branch: bzr merge lp:~kelemeng/gwibber/bug926665
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+91548@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libgwibber-gtk/stream-view-tile.vala'
--- libgwibber-gtk/stream-view-tile.vala 2012-02-01 14:18:29 +0000
+++ libgwibber-gtk/stream-view-tile.vala 2012-02-04 14:02:18 +0000
@@ -221,7 +221,7 @@
221 thumb_box.add (thumbnail);221 thumb_box.add (thumbnail);
222 var thumb_hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);222 var thumb_hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
223 thumb_hbox.pack_start (thumb_box, false, false, 0);223 thumb_hbox.pack_start (thumb_box, false, false, 0);
224 _thumb_expander = new Gtk.Expander.with_mnemonic ("_Show");224 _thumb_expander = new Gtk.Expander.with_mnemonic (_("_Show"));
225 _thumb_expander.set_no_show_all (true);225 _thumb_expander.set_no_show_all (true);
226 _thumb_expander.add (thumb_hbox);226 _thumb_expander.add (thumb_hbox);
227 vbox.pack_start (_thumb_expander, false, false, 4);227 vbox.pack_start (_thumb_expander, false, false, 4);
@@ -232,7 +232,7 @@
232 return false;232 return false;
233 });233 });
234234
235 _comments_expander = new Gtk.Expander.with_mnemonic ("_Comments");235 _comments_expander = new Gtk.Expander.with_mnemonic (_("_Comments"));
236 comments_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);236 comments_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
237 comments_box.set_no_show_all (true);237 comments_box.set_no_show_all (true);
238 _comments_expander.add (comments_box);238 _comments_expander.add (comments_box);
239239
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in 2011-12-06 19:58:21 +0000
+++ po/POTFILES.in 2012-02-04 14:02:18 +0000
@@ -24,6 +24,7 @@
24libgwibber-gtk/stream-view-tile.vala24libgwibber-gtk/stream-view-tile.vala
25libgwibber-gtk/stream-view.vala25libgwibber-gtk/stream-view.vala
26libgwibber-gtk/action-box.vala26libgwibber-gtk/action-box.vala
27libgwibber-gtk/user-view-tile.vala
27lens/src/daemon.vala28lens/src/daemon.vala
28lens/src/main.vala29lens/src/main.vala
29gwibber/actions.py30gwibber/actions.py