Index: capplets/display/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/display/ChangeLog,v
retrieving revision 1.14
diff -p -u -r1.14 ChangeLog
--- capplets/display/ChangeLog	8 Feb 2005 22:42:09 -0000	1.14
+++ capplets/display/ChangeLog	28 Apr 2005 21:31:22 -0000
@@ -1,0 +1,4 @@
+2005-04-28  William Jon McCann  <mccann@jhu.edu>
+
+	* main.c (apply_config, revert_config): Use gnome-screensaver.
+
Index: capplets/display/main.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/display/main.c,v
retrieving revision 1.17
diff -p -u -r1.17 main.c
--- capplets/display/main.c	8 Feb 2005 22:42:09 -0000	1.17
+++ capplets/display/main.c	28 Apr 2005 21:31:22 -0000
@@ -11,6 +11,7 @@
 #include "capplet-util.h"
 
 #define REVERT_COUNT 20
+#define SCREENSAVER_RESTART_COMMAND "gnome-screensaver-command --restart"
 
 struct ScreenInfo
 {
@@ -191,10 +192,10 @@ apply_config (struct DisplayInfo *info)
 
   update_display_info (info, display);
   
-  /* xscreensaver should handle this itself, but does not currently so we hack
-   * it.  Ignore failures in case xscreensaver is not installed */
+  /* the screensaver should handle this itself, but does not currently so we hack
+   * it.  Ignore failures in case screensaver is not installed */
   if (changed)
-   g_spawn_command_line_async ("xscreensaver-command -restart", NULL);
+   g_spawn_command_line_async (SCREENSAVER_RESTART_COMMAND, NULL);
 
   return changed;
 }
@@ -240,9 +241,9 @@ revert_config (struct DisplayInfo *info)
       generate_rate_menu (screen_info);
     }
 
-  /* xscreensaver should handle this itself, but does not currently so we hack
-   * it.  Ignore failures in case xscreensaver is not installed */
-  g_spawn_command_line_async ("xscreensaver-command -restart", NULL);
+  /* the screensaver should handle this itself, but does not currently so we hack
+   * it.  Ignore failures in case screensaver is not installed */
+  g_spawn_command_line_async (SCREENSAVER_RESTART_COMMAND, NULL);
   
   return 0;
 }
Index: gnome-settings-daemon/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/ChangeLog,v
retrieving revision 1.173
diff -p -u -r1.173 ChangeLog
--- gnome-settings-daemon/ChangeLog	14 Mar 2005 21:22:16 -0000	1.173
+++ gnome-settings-daemon/ChangeLog	28 Apr 2005 21:31:31 -0000
@@ -1,0 +1,6 @@
+2005-04-28  William Jon McCann  <mccann@jhu.edu>
+
+	* gnome-settings-screensaver.c (gnome_settings_screensaver_init) 
+	(gnome_settings_screensaver_load): 
+	* gnome-settings-multimedia-keys.c (do_action): Use gnome-screensaver.
+
Index: gnome-settings-daemon/gnome-settings-multimedia-keys.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-multimedia-keys.c,v
retrieving revision 1.12
diff -p -u -r1.12 gnome-settings-multimedia-keys.c
--- gnome-settings-daemon/gnome-settings-multimedia-keys.c	17 Feb 2005 18:19:06 -0000	1.12
+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	28 Apr 2005 21:31:31 -0000
@@ -44,7 +44,8 @@
 
 #define DIALOG_TIMEOUT 1000     /* dialog timeout in ms */
 #define VOLUME_STEP 6           /* percents for one volume button press */
-                                                                                
+#define SCREENSAVER_LOCK_COMMAND    "gnome-screensaver --lock"
+                                                               
 /* we exclude shift, GDK_CONTROL_MASK and GDK_MOD1_MASK since we know what
    these modifiers mean
    these are the mods whose combinations are bound by the keygrabbing code */
@@ -826,7 +827,7 @@ do_action (Acme *acme, int type)
 		do_sleep_action ("apm", "xset dpms force off");
 		break;
 	case SCREENSAVER_KEY:
-		execute ("xscreensaver-command -lock", FALSE);
+		execute (SCREENSAVER_LOCK_COMMAND, FALSE);
 		break;
 	case HELP_KEY:
 		do_help_action (acme);
Index: gnome-settings-daemon/gnome-settings-screensaver.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/gnome-settings-screensaver.c,v
retrieving revision 1.2
diff -p -u -r1.2 gnome-settings-screensaver.c
--- gnome-settings-daemon/gnome-settings-screensaver.c	30 Apr 2002 09:45:05 -0000	1.2
+++ gnome-settings-daemon/gnome-settings-screensaver.c	28 Apr 2005 21:31:31 -0000
@@ -33,7 +33,7 @@
 
 #define START_SCREENSAVER_KEY   "/apps/gnome_settings_daemon/screensaver/start_screensaver"
 #define SHOW_STARTUP_ERRORS_KEY "/apps/gnome_settings_daemon/screensaver/show_startup_errors"
-#define XSCREENSAVER_COMMAND    "xscreensaver -nosplash"
+#define SCREENSAVER_COMMAND    "gnome-screensaver"
 
 void
 gnome_settings_screensaver_init (GConfClient *client)
@@ -41,12 +41,6 @@ gnome_settings_screensaver_init (GConfCl
 	/*
 	 * do nothing.
 	 *
-	 * our settings only apply to startup, and the screensaver
-	 * settings are all in xscreensaver and not gconf.
-	 *
-	 * we could have xscreensaver-demo run gconftool-2 directly,
-	 * and start / stop xscreensaver here
-	 *
 	 */
 }
 
@@ -76,7 +70,7 @@ gnome_settings_screensaver_load (GConfCl
 	if (!start_screensaver)
 		return;
 
-	if (g_spawn_command_line_async (XSCREENSAVER_COMMAND, &gerr))
+	if (g_spawn_command_line_async (SCREENSAVER_COMMAND, &gerr))
 		return;
 	
 	show_error = gconf_client_get_bool (client, SHOW_STARTUP_ERRORS_KEY, NULL);
