Unity

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

  1. fix-lp-1587507
  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: 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) Approve
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.
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
=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp 2016-03-31 09:51:33 +0000
+++ UnityCore/GnomeSessionManager.cpp 2016-05-31 14:59:41 +0000
@@ -117,8 +117,9 @@
117117
118 login_proxy_->ConnectProperty("Active", [this] (GVariant* variant) {118 login_proxy_->ConnectProperty("Active", [this] (GVariant* variant) {
119 bool active = glib::Variant(variant).GetBool();119 bool active = glib::Variant(variant).GetBool();
120 manager_->screensaver_requested.emit(!active);
121 manager_->is_session_active.changed.emit(active);120 manager_->is_session_active.changed.emit(active);
121 if (active)
122 manager_->screensaver_requested.emit(false);
122 });123 });
123124
124 manager_->is_session_active.SetGetterFunction([this] {125 manager_->is_session_active.SetGetterFunction([this] {