Merge lp:~xnox/indicator-session/fix-screensaver-does-nothing into lp:indicator-session/13.04

[Dimitri John Ledkov]

Hide "Start Screen Saver" action, if it is locked down. (LP: #1066825)

[Dimitri John Ledkov (xnox)]

In the case of (!can_lock && !can_switch) the SWITCHER_MODE_SCREENSAVER shows action "Start Screen Saver", but that action does nothing, since the lock_helper doesn't do anything if (!can_switch).

So instead of showing an item that does nothing, hide it by introducing SWITCHER_MODE_NONE. If there is also no guest sessions, we get duplicate separators back to back, so hide that as well.

Steps to reproduce the linked bug are:
* Boot into live-cd
* Observe that "Start Screen Saver" action does nothing

[Charles Kerr (charlesk)]

Thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified.
http://jenkins.qa.ubuntu.com/job/indicator-session-autolanding/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-session-autolanding/./label=quantal/18/console

review: Needs Fixing (continuous-integration)

[Dimitri John Ledkov (xnox)]

Do I need to resubmit or will Jenkins notice the new commit message? =P

=== modified file 'src/session-menu-mgr.c'
--- src/session-menu-mgr.c	2012-10-10 17:24:51 +0000
+++ src/session-menu-mgr.c	2012-10-17 22:49:20 +0000
@@ -65,7 +65,8 @@
   SWITCHER_MODE_SCREENSAVER,
   SWITCHER_MODE_LOCK,
   SWITCHER_MODE_SWITCH,
-  SWITCHER_MODE_SWITCH_OR_LOCK
+  SWITCHER_MODE_SWITCH_OR_LOCK,
+  SWITCHER_MODE_NONE
 }
 SwitcherMode;
 
@@ -956,9 +957,12 @@
   g_list_free (users);
 
   /* separator */
-  mi = mi_new_separator ();
-  dbusmenu_menuitem_child_add_position (mgr->top_mi, mi, pos++);
-  items = g_slist_prepend (items, mi);
+  if (mode != SWITCHER_MODE_SCREENSAVER && !is_guest && guest_allowed)
+    {
+      mi = mi_new_separator ();
+      dbusmenu_menuitem_child_add_position (mgr->top_mi, mi, pos++);
+      items = g_slist_prepend (items, mi);
+    }
 
   if (current_real_name != NULL)
     {
@@ -1147,7 +1151,7 @@
 
   if (!can_lock && !can_switch) /* hmm, quite an extreme lockdown */
     {
-      mode = SWITCHER_MODE_SCREENSAVER;
+      mode = SWITCHER_MODE_NONE;
     }
   else if (is_this_live_session()) /* live sessions can't lock or switch */
     {