Merge lp:~azzar1/indicator-session/lp-1460626-trusty into lp:indicator-session/14.04

[Andrea Azzarone]

Disable shutdown/reboot in the lockscreen.

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

+1

review: Approve

[lp:~azzar1/indicator-session/lp-1460626-trusty]

453. By Andrea Azzarone on 2015-10-20

Sync.

454. By Andrea Azzarone on 2015-10-20

Merge lp:~azzar1/indicator-session/lp-1460626-trusty.

455. By Andrea Azzarone on 2015-10-20

chmod +x debian/rules

456. By Andrea Azzarone on 2015-10-21

Moidfy changelog.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-04 09:29:37 +0000
+++ debian/changelog	2015-10-21 15:24:40 +0000
@@ -1,3 +1,17 @@
+indicator-session (12.10.5+14.04.20151021-0ubuntu1) trusty; urgency=medium
+
+  * Disable shutdown if screen is locked (lp: #1460626)
+
+ -- Andrea  Azzarone <[e-mail]>  Wed, 21 Oct 2015 17:22:37 +0200
+
+indicator-session (12.10.5+14.04.20151008-0ubuntu1) trusty; urgency=medium
+
+  * Backport fix for segfault in get_user_label() (lp: #1501244) (LP:
+    #1501244)
+  * chmod +x debian/rules
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 08 Oct 2015 16:33:40 +0000
+
 indicator-session (12.10.5+14.04.20150404-0ubuntu1) trusty; urgency=medium
 
   [ Dmitry Shachnev ]
 
=== modified file 'debian/rules' (properties changed: -x to +x)
=== modified file 'src/service.c'
--- src/service.c	2014-04-02 15:02:59 +0000
+++ src/service.c	2015-10-21 15:24:40 +0000
@@ -295,12 +295,21 @@
 {
   const char * c;
 
-  /* If blank or whitespace, use username instead */
-  for (c = user->real_name; *c != '\0' && g_ascii_isspace (*c); c++);
-  if (*c == '\0')
-    return user->user_name;
-
-  return user->real_name;
+  /* if real_name exists and is printable, use it */
+  c = user->real_name;
+  if ((c != NULL) && g_utf8_validate(c, -1, NULL))
+    {
+      while (*c != '\0')
+        {
+          if (g_unichar_isgraph(g_utf8_get_char(c)))
+            return user->real_name;
+
+          c = g_utf8_next_char(c);
+        }
+    }
+
+  /* otherwise, use this as a fallback */
+  return user->user_name;
 }
 
 static const char *
@@ -675,7 +684,7 @@
 }
 
 static GMenuModel *
-create_session_section (IndicatorSessionService * self)
+create_session_section (IndicatorSessionService * self, int profile)
 {
   GMenu * menu;
   const priv_t * const p = self->priv;
@@ -690,13 +699,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");
@@ -724,16 +735,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 */
@@ -980,9 +991,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));
     }
 }