--- a/patches/gnome-power-manager-07-screensaver.diff Sun Feb 17 22:40:09 2008 +0000
+++ b/patches/gnome-power-manager-07-screensaver.diff Mon Feb 18 10:01:35 2008 +0000
@@ -47,16 +47,6 @@
<key>/schemas/apps/gnome-power-manager/ui/show_actions_in_menu</key>
<applyto>/apps/gnome-power-manager/ui/show_actions_in_menu</applyto>
<owner>gnome-power-manager</owner>
---- src/gpm-conf.h.orig 2008-02-04 10:01:21.524585000 +0800
-+++ src/gpm-conf.h 2008-02-04 10:03:10.203311000 +0800
-@@ -147,6 +147,7 @@
- #define GPM_CONF_UI_SHOW_CPUFREQ GPM_CONF_DIR "/ui/cpufreq_show"
- #define GPM_CONF_UI_SHOW_ACTIONS_IN_MENU GPM_CONF_DIR "/ui/show_actions_in_menu"
- #define GPM_CONF_UI_ENABLE_BEEPING GPM_CONF_DIR "/ui/enable_sound"
-+#define GPM_CONF_UI_ENABLE_SCREEN_LOCK GPM_CONF_DIR "/ui/enable_screen_lock"
-
- /* we use the gnome-session key now */
- #define GPM_CONF_SESSION_REQUEST_SAVE "/apps/gnome-session/options/auto_save_session"
--- src/gpm-screensaver.c.orig 2008-02-05 13:29:47.692582000 +0800
+++ src/gpm-screensaver.c 2008-02-05 13:31:01.580705000 +0800
@@ -29,6 +29,9 @@
@@ -87,7 +77,7 @@
+ }
+ g_free (command);
+
-+ for (; sleepcount < 50; sleepcount ++) {
++ for (; sleepcount < 20; sleepcount ++) {
+ /* Sleep for 1/10s */
+ g_usleep (1000 * 100);
+ }
@@ -139,3 +129,13 @@
return do_lock;
}
+--- src/gpm-conf.h.orig 2008-02-18 16:47:20.806807000 +0800
++++ src/gpm-conf.h 2008-02-18 16:48:11.849112000 +0800
+@@ -148,6 +148,7 @@
+ #define GPM_CONF_UI_SHOW_ACTIONS_IN_MENU GPM_CONF_DIR "/ui/show_actions_in_menu"
+ #define GPM_CONF_UI_ENABLE_BEEPING GPM_CONF_DIR "/ui/enable_sound"
+ #define GPM_CONF_UI_SHOW_CONTEXT_MENU GPM_CONF_DIR "/ui/show_context_menu"
++#define GPM_CONF_UI_ENABLE_SCREEN_LOCK GPM_CONF_DIR "/ui/enable_screen_lock"
+
+ /* we use the gnome-session key now */
+ #define GPM_CONF_SESSION_REQUEST_SAVE "/apps/gnome-session/options/auto_save_session"