elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-08-16 18:40:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use GNOME key for enabling screen locker (#820)

Browse Source
This commit is contained in:
David Hewitt 2020-05-27 23:10:10 +01:00 committed by GitHub
parent e120718103
commit 7dece426d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/gala.gschema.xml
View File

@ -17,11 +17,6 @@
</enum>
<schema path="/io/elementary/desktop/screensaver/" id="io.elementary.desktop.screensaver">
<key type="b" name="lock-on-screen-off">
<default>true</default>
<summary>Automatically lock the screen when the display turns off due to inactivity</summary>
<description></description>
</key>
<key type="b" name="lock-on-suspend">
<default>true</default>
<summary>Automatically lock the screen when the computer suspends</summary>

15
src/Widgets/ScreenShield.vala
View File

@ -71,7 +71,7 @@ namespace Gala {
// Animation length used for manual lock action (i.e. Super+L or GUI action)
public const uint SHORT_ANIMATION_TIME = 300;
private const string LOCK_ENABLED_KEY = "lock-on-screen-off";
private const string LOCK_ENABLED_KEY = "lock-enabled";
private const string LOCK_PROHIBITED_KEY = "disable-lock-screen";
private const string LOCK_ON_SUSPEND_KEY = "lock-on-suspend";
@ -100,6 +100,7 @@ namespace Gala {
private UnixInputStream? inhibitor;
private GLib.Settings screensaver_settings;
private GLib.Settings lockdown_settings;
private GLib.Settings gala_settings;
@ -110,8 +111,14 @@ namespace Gala {
}
construct {
lockdown_settings = new GLib.Settings ("org.gnome.desktop.lockdown");
// We use the lock-enabled key in the GNOME namespace instead of our own
// because it's also used by gsd-power
screensaver_settings = new GLib.Settings ("org.gnome.desktop.screensaver");
// Vanilla GNOME doesn't have a key that separately enables/disables locking on
// suspend, so we have a key in our own namespace for this
gala_settings = new GLib.Settings ("io.elementary.desktop.screensaver");
lockdown_settings = new GLib.Settings ("org.gnome.desktop.lockdown");
visible = false;
reactive = true;
@ -339,7 +346,7 @@ namespace Gala {
} else {
_set_active (true);
if (gala_settings.get_boolean (LOCK_ENABLED_KEY)) {
if (screensaver_settings.get_boolean (LOCK_ENABLED_KEY)) {
@lock (false);
}
}
@ -359,7 +366,7 @@ namespace Gala {
_set_active (true);
if (gala_settings.get_boolean (LOCK_ENABLED_KEY)) {
if (screensaver_settings.get_boolean (LOCK_ENABLED_KEY)) {
@lock (false);
}