Session Menu

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

  1. fix-screensaver-does-nothing
  2. Merge into trunk.13.04
Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 369
Proposed branch: lp://staging/~xnox/indicator-session/fix-screensaver-does-nothing
Merge into: lp://staging/indicator-session/13.04
Diff against target: 38 lines (+9/-5)
1 file modified
src/session-menu-mgr.c (+9/-5)
To merge this branch: bzr merge lp://staging/~xnox/indicator-session/fix-screensaver-does-nothing
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) Needs Fixing
Charles Kerr (community) Approve
Review via email: mp+130252@code.staging.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

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

Revision history for this message
Charles Kerr (charlesk) wrote :

Thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches