rpms/gnome-screensaver/devel gnome-screensaver-idle-delay.patch, NONE, 1.1 gnome-screensaver.spec, 1.208, 1.209

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-screensaver/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15886

Modified Files:
	gnome-screensaver.spec 
Added Files:
	gnome-screensaver-idle-delay.patch 
Log Message:
Make idle time slider work again


gnome-screensaver-idle-delay.patch:

--- NEW FILE gnome-screensaver-idle-delay.patch ---
diff -up gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c.idle-delay gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c
--- gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c.idle-delay	2009-04-07 14:14:40.559089180 -0400
+++ gnome-screensaver-2.26.0/src/gnome-screensaver-preferences.c	2009-04-07 14:15:09.653053621 -0400
@@ -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"
diff -up gnome-screensaver-2.26.0/src/gs-prefs.c.idle-delay gnome-screensaver-2.26.0/src/gs-prefs.c
--- gnome-screensaver-2.26.0/src/gs-prefs.c.idle-delay	2009-04-07 14:13:23.189342814 -0400
+++ gnome-screensaver-2.26.0/src/gs-prefs.c	2009-04-07 14:14:07.529055689 -0400
@@ -39,10 +39,11 @@ static void gs_prefs_finalize   (GObject
 #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"


Index: gnome-screensaver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- gnome-screensaver.spec	19 Mar 2009 04:21:35 -0000	1.208
+++ gnome-screensaver.spec	7 Apr 2009 18:22:15 -0000	1.209
@@ -14,7 +14,7 @@
 Summary: GNOME Screensaver
 Name: gnome-screensaver
 Version: 2.26.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Amusements/Graphics
 Source0: http://download.gnome.org/sources/gnome-screensaver/2.26/%{name}-%{version}.tar.bz2
@@ -24,6 +24,8 @@
 Patch2: gnome-screensaver-2.26.0-securitytoken.patch
 Patch7: gnome-screensaver-2.20.0-blank-by-default.patch
 Patch8: gnome-screensaver-2.20.0-selinux-permit.patch
+# upstream fix
+Patch9: gnome-screensaver-idle-delay.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.gnome.org
@@ -45,7 +47,6 @@
 # this is here because the configure tests look for protocol headers
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: gettext
-BuildRequires: perl(XML::Parser)
 BuildRequires: nss-devel
 BuildRequires: automake, autoconf, libtool, intltool
 BuildRequires: libXxf86misc-devel
@@ -78,6 +79,8 @@
 %patch2 -p1 -b .securitytoken
 %patch7 -p1 -b .blank-by-default
 %patch8 -p1 -b .selinux-permit
+%patch9 -p1 -b .idle-delay
+
 libtoolize --force --copy
 
 %build
@@ -146,6 +149,9 @@
 %doc %{_mandir}/man1/*.1.gz
 
 %changelog
+* Tue Apr  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-2
+- Make the idle time slider work again
+
 * Thu Mar 19 2009 Matthias Clasen <mclasen at redhat.com> - 2.26.0-1
 - Update to 2.26.0