Merge lp:~robert-ancell/unity-control-center/no-notifications into lp:unity-control-center

Proposed by Robert Ancell on 2016-03-09
Status: Merged
Approved by: Sebastien Bacher on 2016-03-15
Approved revision: 12852
Merged at revision: 12856
Proposed branch: lp:~robert-ancell/unity-control-center/no-notifications
Merge into: lp:unity-control-center
Diff against target: 54 lines (+0/-33)
2 files modified
panels/screen/cc-screen-panel.c (+0/-8)
panels/screen/screen.ui (+0/-25)
To merge this branch: bzr merge lp:~robert-ancell/unity-control-center/no-notifications
Reviewer Review Type Date Requested Status
Sebastien Bacher 2016-03-09 Approve on 2016-03-15
Review via email: mp+288581@code.launchpad.net

Commit message

Remove show notifications code, we don't do that in Unity.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

unsure what that was about but no point keeping the non unity case indeed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/screen/cc-screen-panel.c'
2--- panels/screen/cc-screen-panel.c 2014-02-18 04:27:04 +0000
3+++ panels/screen/cc-screen-panel.c 2016-03-09 22:18:23 +0000
4@@ -540,14 +540,6 @@
5 widget, "sensitive",
6 G_SETTINGS_BIND_GET);
7
8- widget = WID ("show_notifications_check");
9- g_settings_bind (self->priv->lock_settings,
10- "show-notifications",
11- widget, "active",
12- G_SETTINGS_BIND_DEFAULT);
13- if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
14- gtk_widget_hide (widget);
15-
16 update_lock_screen_sensitivity (self);
17
18 /* bind the screen lock suspend checkbutton */
19
20=== modified file 'panels/screen/screen.ui'
21--- panels/screen/screen.ui 2013-11-28 04:44:49 +0000
22+++ panels/screen/screen.ui 2016-03-09 22:18:23 +0000
23@@ -367,31 +367,6 @@
24 <property name="position">3</property>
25 </packing>
26 </child>
27- <child>
28- <object class="GtkBox" id="show_notifications_box">
29- <property name="visible">True</property>
30- <property name="can_focus">False</property>
31- <child>
32- <object class="GtkCheckButton" id="show_notifications_check">
33- <property name="visible">True</property>
34- <property name="can_focus">True</property>
35- <property name="xalign">0</property>
36- <property name="label" translatable="yes">Show _notifications when locked</property>
37- <property name="use_underline">True</property>
38- </object>
39- <packing>
40- <property name="expand">True</property>
41- <property name="fill">True</property>
42- <property name="position">0</property>
43- </packing>
44- </child>
45- </object>
46- <packing>
47- <property name="expand">True</property>
48- <property name="fill">True</property>
49- <property name="position">4</property>
50- </packing>
51- </child>
52 </object>
53 </child>
54 </object>

Subscribers

People subscribed via source and target branches