Merge lp:~azzar1/indicator-session/lp-1460626 into lp:indicator-session/15.10

[Andrea Azzarone]

Disable shutdown/reboot in the lockscreen.

Disable shutdown/reboot in the lockscreen.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:465
http://jenkins.qa.ubuntu.com/job/indicator-session-ci/150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-session-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-session-ci/150/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2015-03-25 22:30:30 +0000
+++ src/service.c	2015-06-04 14:31:59 +0000
@@ -775,7 +775,7 @@
 }
 
 static GMenuModel *
-create_session_section (IndicatorSessionService * self)
+create_session_section (IndicatorSessionService * self, int profile)
 {
   GMenu * menu;
   const priv_t * const p = self->priv;
@@ -790,13 +790,15 @@
   if (indicator_session_actions_can_hibernate (p->backend_actions))
     g_menu_append (menu, _("Hibernate"), "indicator.hibernate");
 
-  if (indicator_session_actions_can_reboot (p->backend_actions))
+  if (profile != PROFILE_LOCKSCREEN && 
+    indicator_session_actions_can_reboot (p->backend_actions))
     {
       const char * label = ellipsis ? _("Restart…") : _("Restart");
       g_menu_append (menu, label, "indicator.reboot");
     }
 
-  if (!g_settings_get_boolean (s, "suppress-shutdown-menuitem"))
+  if (profile != PROFILE_LOCKSCREEN && 
+    !g_settings_get_boolean (s, "suppress-shutdown-menuitem"))
     {
       const char * label = ellipsis ? _("Shut Down…") : _("Shut Down");
       g_menu_append (menu, label, "indicator.power-off");
@@ -824,16 +826,16 @@
       sections[n++] = create_settings_section (self);
       sections[n++] = create_switch_section (self, profile);
       sections[n++] = create_logout_section (self);
-      sections[n++] = create_session_section (self);
+      sections[n++] = create_session_section (self, profile);
     }
   else if (profile == PROFILE_GREETER)
     {
-      sections[n++] = create_session_section (self);
+      sections[n++] = create_session_section (self, profile);
     }
   else if (profile == PROFILE_LOCKSCREEN)
     {
       sections[n++] = create_switch_section (self, profile);
-      sections[n++] = create_session_section (self);
+      sections[n++] = create_session_section (self, profile);
     }
 
   /* add sections to the submenu */
@@ -1080,9 +1082,9 @@
 
   if (sections & SECTION_SESSION)
     {
-      rebuild_section (desktop->submenu, 4, create_session_section(self));
-      rebuild_section (greeter->submenu, 0, create_session_section(self));
-      rebuild_section (lockscreen->submenu, 1, create_session_section(self));
+      rebuild_section (desktop->submenu, 4, create_session_section(self, PROFILE_DESKTOP));
+      rebuild_section (greeter->submenu, 0, create_session_section(self, PROFILE_GREETER));
+      rebuild_section (lockscreen->submenu, 1, create_session_section(self, PROFILE_LOCKSCREEN));
     }
 }