Unity

Merge lp://qastaging/~azzar1/unity/sh-72 into lp://qastaging/unity/7.2

sh-72
Merge into trusty

Proposed by Andrea Azzarone on 2016-04-07

Status:

Merged

Approved by:

Marco Trevisan (Treviño) on 2016-04-08

Approved revision:

no longer in the source branch.

Merged at revision:

3837

Proposed branch:

lp://qastaging/~azzar1/unity/sh-72

Merge into:

lp://qastaging/unity/7.2

Diff against target:

1030 lines (+242/-469)

25 files modified

UnityCore/GnomeSessionManager.cpp (+8/-2)
UnityCore/SessionManager.h (+1/-0)
lockscreen/CMakeLists.txt (+1/-2)
lockscreen/LockScreenAbstractShield.h (+3/-5)
lockscreen/LockScreenAcceleratorController.h (+1/-1)
lockscreen/LockScreenController.cpp (+26/-9)
lockscreen/LockScreenController.h (+3/-5)
lockscreen/LockScreenPanel.h (+3/-3)
lockscreen/LockScreenShieldFactory.h (+2/-0)
lockscreen/ShutdownNotifier.cpp (+0/-152)
lockscreen/ShutdownNotifier.h (+0/-51)
lockscreen/SuspendInhibitorManager.cpp (+131/-0)
lockscreen/SuspendInhibitorManager.h (+54/-0)
lockscreen/SuspendNotifier.cpp (+0/-153)
lockscreen/SuspendNotifier.h (+0/-51)
lockscreen/UserPromptView.h (+1/-1)
lockscreen/pch/lockscreen_pch.hh (+2/-2)
shutdown/SessionController.h (+1/-1)
shutdown/SessionDBusManager.h (+3/-3)
shutdown/SessionView.h (+1/-1)
tests/test_mock_session_manager.h (+1/-1)
unity-shared/PluginAdapter.cpp (+0/-20)
unity-shared/PluginAdapter.h (+0/-1)
unity-shared/StandaloneWindowManager.h (+0/-2)
unity-shared/WindowManager.h (+0/-3)

To merge this branch:

bzr merge lp://qastaging/~azzar1/unity/sh-72

Medium

Fix Released