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

Proposed by Robert Ancell
Status: Merged
Approved by: Sebastien Bacher
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 Approve
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.
Revision history for this message
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
=== modified file 'panels/screen/cc-screen-panel.c'
--- panels/screen/cc-screen-panel.c 2014-02-18 04:27:04 +0000
+++ panels/screen/cc-screen-panel.c 2016-03-09 22:18:23 +0000
@@ -540,14 +540,6 @@
540 widget, "sensitive",540 widget, "sensitive",
541 G_SETTINGS_BIND_GET);541 G_SETTINGS_BIND_GET);
542542
543 widget = WID ("show_notifications_check");
544 g_settings_bind (self->priv->lock_settings,
545 "show-notifications",
546 widget, "active",
547 G_SETTINGS_BIND_DEFAULT);
548 if (!g_strcmp0(g_getenv("XDG_CURRENT_DESKTOP"), "Unity"))
549 gtk_widget_hide (widget);
550
551 update_lock_screen_sensitivity (self);543 update_lock_screen_sensitivity (self);
552544
553 /* bind the screen lock suspend checkbutton */545 /* bind the screen lock suspend checkbutton */
554546
=== modified file 'panels/screen/screen.ui'
--- panels/screen/screen.ui 2013-11-28 04:44:49 +0000
+++ panels/screen/screen.ui 2016-03-09 22:18:23 +0000
@@ -367,31 +367,6 @@
367 <property name="position">3</property>367 <property name="position">3</property>
368 </packing>368 </packing>
369 </child>369 </child>
370 <child>
371 <object class="GtkBox" id="show_notifications_box">
372 <property name="visible">True</property>
373 <property name="can_focus">False</property>
374 <child>
375 <object class="GtkCheckButton" id="show_notifications_check">
376 <property name="visible">True</property>
377 <property name="can_focus">True</property>
378 <property name="xalign">0</property>
379 <property name="label" translatable="yes">Show _notifications when locked</property>
380 <property name="use_underline">True</property>
381 </object>
382 <packing>
383 <property name="expand">True</property>
384 <property name="fill">True</property>
385 <property name="position">0</property>
386 </packing>
387 </child>
388 </object>
389 <packing>
390 <property name="expand">True</property>
391 <property name="fill">True</property>
392 <property name="position">4</property>
393 </packing>
394 </child>
395 </object>370 </object>
396 </child>371 </child>
397 </object>372 </object>

Subscribers

People subscribed via source and target branches