gnome-screensaver r1651 - in trunk: . src

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Apr  7 18:21:44 2009
New Revision: 1651
URL: http://svn.gnome.org/viewvc/gnome-screensaver?rev=1651&view=rev

Log:
Make the idle time slider work again


Modified:
   trunk/ChangeLog
   trunk/src/gnome-screensaver-preferences.c
   trunk/src/gs-prefs.c

Modified: trunk/src/gnome-screensaver-preferences.c
==============================================================================
--- trunk/src/gnome-screensaver-preferences.c	(original)
+++ trunk/src/gnome-screensaver-preferences.c	Tue Apr  7 18:21:44 2009
@@ -50,10 +50,11 @@
 #define KEY_LOCK_DISABLE    GNOME_LOCKDOWN_DIR "/disable_lock_screen"
 
 #define KEY_DIR             "/apps/gnome-screensaver"
+#define GNOME_SESSION_DIR   "/desktop/gnome/session"
 #define KEY_LOCK            KEY_DIR "/lock_enabled"
 #define KEY_IDLE_ACTIVATION_ENABLED         KEY_DIR "/idle_activation_enabled"
 #define KEY_MODE            KEY_DIR "/mode"
-#define KEY_ACTIVATE_DELAY  KEY_DIR "/idle_delay"
+#define KEY_ACTIVATE_DELAY  GNOME_SESSION_DIR "/idle_delay"
 #define KEY_LOCK_DELAY      KEY_DIR "/lock_delay"
 #define KEY_CYCLE_DELAY     KEY_DIR "/cycle_delay"
 #define KEY_THEMES          KEY_DIR "/themes"

Modified: trunk/src/gs-prefs.c
==============================================================================
--- trunk/src/gs-prefs.c	(original)
+++ trunk/src/gs-prefs.c	Tue Apr  7 18:21:44 2009
@@ -39,10 +39,11 @@
 #define KEY_USER_SWITCH_DISABLE   GNOME_LOCKDOWN_DIR "/disable_user_switching"
 
 #define KEY_DIR            "/apps/gnome-screensaver"
+#define GNOME_SESSION_DIR  "/desktop/gnome/session"
 #define KEY_IDLE_ACTIVATION_ENABLED         KEY_DIR "/idle_activation_enabled"
 #define KEY_LOCK_ENABLED   KEY_DIR "/lock_enabled"
 #define KEY_MODE           KEY_DIR "/mode"
-#define KEY_ACTIVATE_DELAY KEY_DIR "/idle_delay"
+#define KEY_ACTIVATE_DELAY GNOME_SESSION_DIR "/idle_delay"
 #define KEY_POWER_DELAY    KEY_DIR "/power_management_delay"
 #define KEY_LOCK_DELAY     KEY_DIR "/lock_delay"
 #define KEY_CYCLE_DELAY    KEY_DIR "/cycle_delay"