Unity

Merge lp:~bregma/unity/lp-1410582-trusty into lp:unity/7.2

  1. lp-1410582-trusty
  2. Merge into trusty
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3809
Proposed branch: lp:~bregma/unity/lp-1410582-trusty
Merge into: lp:unity/7.2
Diff against target: 13 lines (+3/-0)
1 file modified
UnityCore/GnomeSessionManager.cpp (+3/-0)
To merge this branch: bzr merge lp:~bregma/unity/lp-1410582-trusty
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Review via email: mp+252636@code.launchpad.net

Commit message

Avoid running potentially dangerous code paths when the screen is locked.

Description of the change

Avoid running potentially dangerous code paths when the screen is locked.

Cherry-picked from trunk.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

LGTM

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 2014-12-16 19:27:36 +0000
3+++ UnityCore/GnomeSessionManager.cpp 2015-03-11 18:45:23 +0000
4@@ -648,6 +648,9 @@
5
6 bool GnomeManager::CanLock() const
7 {
8+ if (is_locked())
9+ return true;
10+
11 glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
12
13 if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()) ||

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: