diff --git a/glib2-branding.changes b/glib2-branding.changes index 0b52340..db190ea 100644 --- a/glib2-branding.changes +++ b/glib2-branding.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 7 08:53:34 UTC 2020 - QK ZHU + +- Update .gschema.override.in: + + Delete unused settings-daemon.plugins.power keys. + + Set sleep-inactive-ac-timeout, sleep-inactive-battery-timeout to + 0 for SLE to be consistent with old versions (bsc#1158497). + ------------------------------------------------------------------- Tue Oct 29 15:31:01 UTC 2019 - Michael Gorse diff --git a/glib2-branding.gschema.override.in b/glib2-branding.gschema.override.in index 6bd8d4c..bc43c82 100644 --- a/glib2-branding.gschema.override.in +++ b/glib2-branding.gschema.override.in @@ -54,14 +54,10 @@ tap-to-click = true ignore-paths = ['/boot/efi'] [org.gnome.settings-daemon.plugins.power] -## Enable Energy Star compliant default configuration -sleep-inactive-battery-type = "suspend" -## To complete Energy Star compliant default configuration, you should enable this too: -## (disabled by default because suspending is not working fine in all cases) -# sleep-inactive-ac = true -# sleep-inactive-ac-timeout = 1200 -# sleep-inactive-battery = true -# sleep-inactive-battery-timeout = 1200 +@@IF_SLE@@## Energy Star compliant configuration is disabled for SLE from vendor level +@@IF_SLE@@## The recommended way to enable this is via GNOME Control Center, dconf-editor or gsettings +@@IF_SLE@@sleep-inactive-ac-timeout = 0 +@@IF_SLE@@sleep-inactive-battery-timeout = 0 [org.gnome.settings-daemon.plugins.xsettings] ## the PackageKit gtk+ module is too spammy, fdo#23917 diff --git a/glib2-branding.spec b/glib2-branding.spec index c3d5156..06cc091 100644 --- a/glib2-branding.spec +++ b/glib2-branding.spec @@ -1,7 +1,7 @@ # # spec file for package glib2-branding # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed