Merge lp:~3v1n0/indicator-session/unity-session into lp:indicator-session/14.04
Proposed by
Marco Trevisan (Treviño)
Status: | Merged |
---|---|
Approved by: | Charles Kerr |
Approved revision: | 441 |
Merged at revision: | 445 |
Proposed branch: | lp:~3v1n0/indicator-session/unity-session |
Merge into: | lp:indicator-session/14.04 |
Diff against target: |
417 lines (+223/-8) 8 files modified
src/backend-dbus/CMakeLists.txt (+5/-1) src/backend-dbus/actions.c (+70/-5) src/backend-dbus/com.canonical.Unity.Session.xml (+12/-0) tests/backend-dbus/CMakeLists.txt (+2/-0) tests/backend-dbus/gtest-mock-dbus-fixture.h (+4/-0) tests/backend-dbus/mock-unity-session.cc (+71/-0) tests/backend-dbus/mock-unity-session.h (+53/-0) tests/backend-dbus/test-actions.cc (+6/-2) |
To merge this branch: | bzr merge lp:~3v1n0/indicator-session/unity-session |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Charles Kerr (community) | Approve | ||
Sebastien Bacher | Needs Fixing | ||
Lars Karlitski (community) | Approve | ||
Review via email:
|
Commit message
DBusActions: use unity session APIs when unity is running
Use Immediate lock when switching, and rely to standard lock (with fade) in normal cases.
Description of the change
Fixes the unity fade-to-lock that might happen after switching a session, and thus that could quickly present user informations to others (that just switch tty).
To post a comment you must log in.
FAILED: Continuous integration, rev:438 jenkins. qa.ubuntu. com/job/ indicator- session- ci/132/ jenkins. qa.ubuntu. com/job/ indicator- session- trusty- amd64-ci/ 28/console jenkins. qa.ubuntu. com/job/ indicator- session- trusty- armhf-ci/ 28/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- session- ci/132/ rebuild
http://