Unity

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

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

Commit message

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

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote :

I don't think this will hurt anything.

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 2014-10-21 13:45:43 +0000
+++ UnityCore/GnomeSessionManager.cpp 2015-01-14 00:16:29 +0000
@@ -648,6 +648,9 @@
648648
649bool GnomeManager::CanLock() const649bool GnomeManager::CanLock() const
650{650{
651 if (is_locked())
652 return true;
653
651 glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));654 glib::Object<GSettings> lockdown_settings(g_settings_new(GNOME_LOCKDOWN_OPTIONS.c_str()));
652655
653 if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()) ||656 if (g_settings_get_boolean(lockdown_settings, DISABLE_LOCKSCREEN_KEY.c_str()) ||