Merge lp://qastaging/~azzar1/unity/unmap-on-shutdown into lp://qastaging/unity
Proposed by
Andrea Azzarone
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3885 |
Proposed branch: | lp://qastaging/~azzar1/unity/unmap-on-shutdown |
Merge into: | lp://qastaging/unity |
Diff against target: |
903 lines (+587/-26) 19 files modified
UnityCore/GLibDBusProxy.cpp (+100/-3) UnityCore/GLibDBusProxy.h (+6/-0) UnityCore/GLibWrapper-inl.h (+12/-0) UnityCore/GLibWrapper.h (+1/-0) UnityCore/GnomeSessionManager.cpp (+0/-1) lockscreen/CMakeLists.txt (+2/-0) lockscreen/LockScreenController.cpp (+10/-1) lockscreen/LockScreenController.h (+4/-1) lockscreen/ShutdownNotifier.cpp (+152/-0) lockscreen/ShutdownNotifier.h (+51/-0) lockscreen/SuspendNotifier.cpp (+153/-0) lockscreen/SuspendNotifier.h (+51/-0) plugins/unityshell/src/unityshell.cpp (+1/-18) unity-shared/PluginAdapter.cpp (+34/-0) unity-shared/PluginAdapter.h (+3/-0) unity-shared/StandaloneWindowManager.h (+2/-0) unity-shared/UScreen.cpp (+2/-1) unity-shared/UScreen.h (+0/-1) unity-shared/WindowManager.h (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~azzar1/unity/unmap-on-shutdown |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Marco Trevisan (Treviño) | Approve | ||
Review via email: mp+237997@code.qastaging.launchpad.net |
Commit message
Unmap all windows during shutdown.
Description of the change
== Problem ==
#1370017 Unity Lockscreen shows unlocked desktop while shutting down
== Fix ==
Unmap all windows during shutdown.
To post a comment you must log in.
PASSED: Continuous integration, rev:3877 jenkins. qa.ubuntu. com/job/ unity-ci/ 1094/ jenkins. qa.ubuntu. com/job/ unity-utopic- amd64-ci/ 181 jenkins. qa.ubuntu. com/job/ unity-utopic- armhf-ci/ 181 jenkins. qa.ubuntu. com/job/ unity-utopic- i386-ci/ 181
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- ci/1094/ rebuild
http://