[gnome-screensaver] Remove unused power management delay
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-screensaver] Remove unused power management delay
- Date: Sun, 6 Mar 2011 06:00:07 +0000 (UTC)
commit 591a72e70f66bc6cd9c1a2f8b64f0d9b46430635
Author: William Jon McCann <jmccann redhat com>
Date: Sun Mar 6 00:02:48 2011 -0500
Remove unused power management delay
src/gs-prefs.c | 28 ----------------------------
src/gs-prefs.h | 1 -
2 files changed, 0 insertions(+), 29 deletions(-)
---
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index 6e05c1f..21cc80f 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -45,7 +45,6 @@ static void gs_prefs_finalize (GObject *object);
#define GS_SETTINGS_SCHEMA "org.gnome.desktop.screensaver"
#define KEY_IDLE_ACTIVATION_ENABLED "idle-activation-enabled"
#define KEY_LOCK_ENABLED "lock-enabled"
-#define KEY_POWER_DELAY "power-management-delay"
#define KEY_LOCK_DELAY "lock-delay"
#define KEY_USER_SWITCH_ENABLED "user-switch-enabled"
#define KEY_LOGOUT_ENABLED "logout-enabled"
@@ -144,22 +143,6 @@ _gs_prefs_set_timeout (GSPrefs *prefs,
}
static void
-_gs_prefs_set_power_timeout (GSPrefs *prefs,
- guint value)
-{
- if (value < 1)
- value = 60;
-
- /* pick a reasonable large number for the
- upper bound */
- if (value > 480)
- value = 480;
-
- /* this value is in seconds - others are in minutes */
- prefs->power_timeout = value * 1000;
-}
-
-static void
_gs_prefs_set_lock_timeout (GSPrefs *prefs,
guint value)
{
@@ -299,9 +282,6 @@ gs_prefs_load_from_settings (GSPrefs *prefs)
uvalue = _gs_settings_get_uint (prefs->priv->session_settings, KEY_ACTIVATE_DELAY);
_gs_prefs_set_timeout (prefs, uvalue);
- uvalue = _gs_settings_get_uint (prefs->priv->settings, KEY_POWER_DELAY);
- _gs_prefs_set_power_timeout (prefs, uvalue);
-
uvalue = _gs_settings_get_uint (prefs->priv->settings, KEY_LOCK_DELAY);
_gs_prefs_set_lock_timeout (prefs, uvalue);
@@ -347,13 +327,6 @@ key_changed_cb (GSettings *settings,
delay = _gs_settings_get_uint (settings, key);
_gs_prefs_set_timeout (prefs, delay);
- } else if (strcmp (key, KEY_POWER_DELAY) == 0) {
-
- guint delay;
-
- delay = _gs_settings_get_uint (settings, key);
- _gs_prefs_set_power_timeout (prefs, delay);
-
} else if (strcmp (key, KEY_LOCK_DELAY) == 0) {
guint delay;
@@ -473,7 +446,6 @@ gs_prefs_init (GSPrefs *prefs)
prefs->user_switch_enabled = FALSE;
prefs->timeout = 600000;
- prefs->power_timeout = 60000;
prefs->lock_timeout = 0;
prefs->logout_timeout = 14400000;
diff --git a/src/gs-prefs.h b/src/gs-prefs.h
index 647c70f..aa124e4 100644
--- a/src/gs-prefs.h
+++ b/src/gs-prefs.h
@@ -49,7 +49,6 @@ typedef struct
guint keyboard_enabled : 1; /* Whether to try to embed a keyboard */
guint status_message_enabled : 1; /* show the status message in the lock */
- guint power_timeout; /* how much idle time before power management */
guint timeout; /* how much idle time before activation */
guint lock_timeout; /* how long after activation locking starts */
guint logout_timeout; /* how long until the logout option appears */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]