Unity

Merge lp:~azzar1/unity/fix-1308850 into lp:unity

  1. fix-1308850
  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: 3789
Proposed branch: lp:~azzar1/unity/fix-1308850
Merge into: lp:unity
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/unityshell/src/unityshell.cpp (+1/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-1308850
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+216282@code.launchpad.net

Commit message

Close dash/hud/etc. on signal locked too.

Description of the change

session::Manager::lock_requested is not emitted if screen lock automatically. So close dash/hud/etc. on locked signal too.

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

PASSED: Continuous integration, rev:3789
http://jenkins.qa.ubuntu.com/job/unity-ci/886/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/422
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/418
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/420

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

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

Right...

review: Approve
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Ups, changed my mind...

You should instaed:

manager->prompt_lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));

review: Abstain
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

LGTM

review: Approve
Revision history for this message
Andrea Azzarone (azzar1) wrote :

Updated!

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

PASSED: Continuous integration, rev:3790
http://jenkins.qa.ubuntu.com/job/unity-ci/888/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/422

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2014-04-16 22:17:50 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2014-04-17 18:56:31 +0000
4@@ -3844,6 +3844,7 @@
5 // Setup Session Controller
6 auto manager = std::make_shared<session::GnomeManager>();
7 manager->lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));
8+ manager->prompt_lock_requested.connect(sigc::mem_fun(this, &UnityScreen::OnLockScreenRequested));
9 manager->locked.connect(sigc::bind(sigc::mem_fun(this, &UnityScreen::SaveLockStamp), true));
10 manager->unlocked.connect(sigc::bind(sigc::mem_fun(this, &UnityScreen::SaveLockStamp), false));
11 session_dbus_manager_ = std::make_shared<session::DBusManager>(manager);