Unity

Merge lp:~azzar1/unity/lp-1460626 into lp:unity

  1. lp-1460626
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 4002
Proposed branch: lp:~azzar1/unity/lp-1460626
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
UnityCore/GnomeSessionManager.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/lp-1460626
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+262443@code.launchpad.net

Commit message

Do not allow shutdown when screen is locked.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3973
http://jenkins.qa.ubuntu.com/job/unity-ci/1253/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/31/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1253/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/GnomeSessionManager.cpp'
2--- UnityCore/GnomeSessionManager.cpp 2015-01-24 00:56:37 +0000
3+++ UnityCore/GnomeSessionManager.cpp 2015-06-19 12:48:33 +0000
4@@ -679,7 +679,7 @@
5
6 bool GnomeManager::CanShutdown() const
7 {
8- return impl_->can_shutdown_;
9+ return !is_locked() && impl_->can_shutdown_;
10 }
11
12 bool GnomeManager::CanSuspend() const