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

Proposed by Andrea Azzarone on 2016-05-31
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-06-06
Approved revision: 4122
Merged at revision: 4127
Proposed branch: lp:~azzar1/unity/fix-lp-1587507
Merge into: lp:unity
Diff against target: 14 lines (+2/-1)
1 file modified
UnityCore/GnomeSessionManager.cpp (+2/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-lp-1587507
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2016-05-31 Approve on 2016-06-06
PS Jenkins bot continuous-integration Pending
Review via email: mp+296112@code.launchpad.net

Commit message

Do not trigger screensaver on session inactive.

Description of the change

Do not trigger screensaver on session inactive.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UnityCore/GnomeSessionManager.cpp'
2--- UnityCore/GnomeSessionManager.cpp 2016-03-31 09:51:33 +0000
3+++ UnityCore/GnomeSessionManager.cpp 2016-05-31 14:59:41 +0000
4@@ -117,8 +117,9 @@
5
6 login_proxy_->ConnectProperty("Active", [this] (GVariant* variant) {
7 bool active = glib::Variant(variant).GetBool();
8- manager_->screensaver_requested.emit(!active);
9 manager_->is_session_active.changed.emit(active);
10+ if (active)
11+ manager_->screensaver_requested.emit(false);
12 });
13
14 manager_->is_session_active.SetGetterFunction([this] {