[gnome-settings-daemon] power: Check for on_battery closer to where needed
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] power: Check for on_battery closer to where needed
- Date: Mon, 17 Jun 2013 15:10:37 +0000 (UTC)
commit d7781ca5fee5b85a0877bdb5d2d378d85539d6e4
Author: Bastien Nocera <hadess hadess net>
Date: Sat Apr 20 15:12:35 2013 +0200
power: Check for on_battery closer to where needed
plugins/power/gsd-power-manager.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 8d3e247..8122845 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -2658,7 +2658,6 @@ idle_configure (GsdPowerManager *manager)
/* set up blank callback only when the screensaver is on,
* as it's what will drive the blank */
- on_battery = up_client_get_on_battery (manager->priv->up_client);
timeout_blank = 0;
if (manager->priv->screensaver_active) {
/* The tail is wagging the dog.
@@ -2681,6 +2680,7 @@ idle_configure (GsdPowerManager *manager)
/* only do the sleep timeout when the session is idle
* and we aren't inhibited from sleeping (or logging out, etc.) */
+ on_battery = up_client_get_on_battery (manager->priv->up_client);
action_type = g_settings_get_enum (manager->priv->settings, on_battery ?
"sleep-inactive-battery-type" : "sleep-inactive-ac-type");
timeout_sleep = 0;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]