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

[Andrea Azzarone]

GnomeSessionManager: Do not allow shutdown when screen is locked.

Backport from trunk

Disable shutdown from lockscreen. Backfort the fix from trunk.

[PS Jenkins bot (ps-jenkins)]

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)

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2015-03-16 17:29:46 +0000
+++ UnityCore/GnomeSessionManager.cpp	2015-10-14 13:43:15 +0000
@@ -679,7 +679,7 @@
 
 bool GnomeManager::CanShutdown() const
 {
-  return impl_->can_shutdown_;
+  return !is_locked() && impl_->can_shutdown_;
 }
 
 bool GnomeManager::CanSuspend() const