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

Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (TreviƱo)
Approved revision: 3833
Merged at revision: 3834
Proposed branch: lp:~azzar1/unity/lp-1460626-trusty
Merge into: lp:unity/7.2
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-trusty
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+274396@code.launchpad.net

Commit message

GnomeSessionManager: Do not allow shutdown when screen is locked.

Backport from trunk

Description of the change

Disable shutdown from lockscreen. Backfort the fix from trunk.

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

FAILED: Continuous integration, rev:3833
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~azzar1/unity/lp-1460626-trusty/+merge/274396/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-7.2-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-armhf-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.2-trusty-i386-ci/24

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

review: Needs Fixing (continuous-integration)

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-03-16 17:29:46 +0000
3+++ UnityCore/GnomeSessionManager.cpp 2015-10-14 13:43:15 +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

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: