Merge lp:~wingpanel-devs/wingpanel-indicator-notifications/set-main into lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications

Proposed by Danielle Foré
Status: Merged
Approved by: Danielle Foré
Approved revision: 30
Merged at revision: 31
Proposed branch: lp:~wingpanel-devs/wingpanel-indicator-notifications/set-main
Merge into: lp:~wingpanel-devs/wingpanel-indicator-notifications/wingpanel-indicator-notifications
Diff against target: 41 lines (+5/-5)
1 file modified
src/Indicator.vala (+5/-5)
To merge this branch: bzr merge lp:~wingpanel-devs/wingpanel-indicator-notifications/set-main
Reviewer Review Type Date Requested Status
Adam Bieńkowski Pending
Review via email: mp+262872@code.launchpad.net

This proposal supersedes a proposal from 2015-06-21.

Commit message

set_main_icon instead of set_overlay_icon

To post a comment you must log in.
Revision history for this message
Adam Bieńkowski (donadigo) : Posted in a previous version of this proposal
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Indicator.vala'
2--- src/Indicator.vala 2015-06-19 22:01:32 +0000
3+++ src/Indicator.vala 2015-06-24 15:39:11 +0000
4@@ -119,7 +119,7 @@
5 } else {
6 main_box.set_size_request (BOX_WIDTH, -1);
7 stack.set_visible_child_name ("no-notifications");
8- dynamic_icon.set_overlay_icon_name (get_display_icon_name ());
9+ dynamic_icon.set_main_icon_name (get_display_icon_name ());
10 clear_all_btn.sensitive = false;
11 }
12 });
13@@ -132,12 +132,12 @@
14 var entry = new NotificationEntry (notification);
15 nlist.add_item (entry);
16
17- dynamic_icon.set_overlay_icon_name (get_display_icon_name ());
18+ dynamic_icon.set_main_icon_name (get_display_icon_name ());
19 });
20
21 nsettings.changed["do-not-disturb"].connect (() => {
22 not_disturb_switch.get_switch ().active = nsettings.do_not_disturb;
23- dynamic_icon.set_overlay_icon_name (get_display_icon_name ());
24+ dynamic_icon.set_main_icon_name (get_display_icon_name ());
25 });
26
27 main_box.add (not_disturb_switch);
28@@ -155,11 +155,11 @@
29 var entry = new NotificationEntry (notification);
30 nlist.add_item (entry);
31
32- dynamic_icon.set_overlay_icon_name (get_display_icon_name ());
33+ dynamic_icon.set_main_icon_name (get_display_icon_name ());
34 });
35 }
36
37- dynamic_icon.set_overlay_icon_name (get_display_icon_name ());
38+ dynamic_icon.set_main_icon_name (get_display_icon_name ());
39 }
40
41 return main_box;

Subscribers

People subscribed via source and target branches