summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-08-06 16:25:36 +0200
committerBastien Nocera <hadess@hadess.net>2013-08-06 16:28:34 +0200
commite7b2835443d4e0bbb4d379de0b9dcae5c36bebfe (patch)
tree07cdd488b9128ff05d4fc09da599f5d3cab874b1
parentef4ae20315de08a41e9c06402d3fad9bdb5983e6 (diff)
downloadgnome-settings-daemon-e7b2835443d4e0bbb4d379de0b9dcae5c36bebfe.tar.gz
power: Handle critical action for UPSes
And the case where logind doesn't respond. Spotted by Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> https://bugzilla.gnome.org/show_bug.cgi?id=705525
-rw-r--r--plugins/power/gsd-power-manager.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 346bd9fb..3e934512 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -1163,7 +1163,7 @@ static GsdPowerActionType
manager_critical_action_get (GsdPowerManager *manager,
gboolean is_ups)
{
- GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN;
+ GsdPowerActionType policy;
GVariant *result = NULL;
policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
@@ -1194,6 +1194,8 @@ manager_critical_action_get (GsdPowerManager *manager,
if (g_strcmp0 (s, "yes") != 0)
policy = GSD_POWER_ACTION_SHUTDOWN;
g_variant_unref (result);
+ } else {
+ policy = GSD_POWER_ACTION_SHUTDOWN;
}
return policy;