Wingpanel Keyboard Indicator

Merge lp:~wingpanel-devs/wingpanel-indicator-keyboard/adapt_to_lib_change into lp:~wingpanel-devs/wingpanel-indicator-keyboard/trunk

  1. adapt_to_lib_change
  2. Merge into trunk
Proposed by Djax
Status: Merged
Approved by: Djax
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~wingpanel-devs/wingpanel-indicator-keyboard/adapt_to_lib_change
Merge into: lp:~wingpanel-devs/wingpanel-indicator-keyboard/trunk
Diff against target: 17 lines (+6/-1)
1 file modified
src/Widgets/LayoutButton.vala (+6/-1)
To merge this branch: bzr merge lp:~wingpanel-devs/wingpanel-indicator-keyboard/adapt_to_lib_change
Reviewer Review Type Date Requested Status
Marcus Wichelmann (community) Approve
Review via email: mp+282849@code.launchpad.net

Commit message

adapt to new wingpanel lib changes

Description of the change

adapt to new wingpanel lib changes

To post a comment you must log in.
Revision history for this message
Marcus Wichelmann (l-admin-3) :
review: Approve (code)
Revision history for this message
Marcus Wichelmann (l-admin-3) wrote :

works, thank you. ;)

review: Approve
lp:~wingpanel-devs/wingpanel-indicator-keyboard/adapt_to_lib_change updated
21. By Djax

make compatible with lp:~wingpanel-devs/wingpanel/icon-buttons

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Widgets/LayoutButton.vala'
2--- src/Widgets/LayoutButton.vala 2015-06-19 21:39:04 +0000
3+++ src/Widgets/LayoutButton.vala 2016-01-16 17:07:47 +0000
4@@ -24,7 +24,12 @@
5 private GLib.Settings settings;
6
7 public LayoutButton (string caption, string code, uint32 id, string dir) {
8- base.with_mnemonic (caption, new Gdk.Pixbuf.from_file (dir));
9+ base.with_mnemonic (caption);
10+ try {
11+ base.set_pixbuf (new Gdk.Pixbuf.from_file (dir));
12+ } catch (Error e) {
13+ error ("Failed to set pixbuf");
14+ }
15
16 this.caption = caption;
17 this.code = code;

Subscribers

People subscribed via source and target branches

to all changes: