summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2015-05-15 16:41:36 +0200
committerBastien Nocera <hadess@hadess.net>2015-05-18 15:49:51 +0200
commitd80738c4266c831badbeb5072a103eb910e91415 (patch)
tree00734853aae396e453d7b0ccdcf126e5cc56a8b8
parent5e2aa1d34790fef7de7c4202cf15d73a886e2598 (diff)
downloadgnome-settings-daemon-d80738c4266c831badbeb5072a103eb910e91415.tar.gz
power: Remove critical-battery-action key
It's not used anymore. https://bugzilla.gnome.org/show_bug.cgi?id=749436
-rw-r--r--data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in5
-rwxr-xr-xplugins/power/test.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
index 1fd60e73..51d017b3 100644
--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
@@ -61,10 +61,5 @@
<summary>Power button action</summary>
<description>The action to take when the system power button is pressed.</description>
</key>
- <key name="critical-battery-action" enum="org.gnome.settings-daemon.GsdPowerActionType">
- <default>'hibernate'</default>
- <summary>Battery critical low action</summary>
- <description>The action to take when the battery is critically low.</description>
- </key>
</schema>
</schemalist>
diff --git a/plugins/power/test.py b/plugins/power/test.py
index 1de59f8d..0ff4b1f4 100755
--- a/plugins/power/test.py
+++ b/plugins/power/test.py
@@ -86,6 +86,7 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
# start power plugin
self.settings_gsd_power['active'] = False
# As hibernate is not available, suspend by default on critical
+ # FIXME
self.settings_gsd_power['critical-battery-action'] = 'suspend'
Gio.Settings.sync()
self.plugin_log_write = open(os.path.join(self.workdir, 'plugin_power.log'), 'wb')
@@ -501,6 +502,7 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
self.settings_session['idle-delay'] = 2
self.settings_gsd_power['sleep-inactive-battery-timeout'] = 5
# Hibernate isn't possible, so it should end up suspending
+ # FIXME
self.settings_gsd_power['critical-battery-action'] = 'hibernate'
# wait for idle delay; should not yet hibernate