Index: gnome-panel/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/ChangeLog,v
retrieving revision 1.2627
diff -p -u -r1.2627 ChangeLog
--- gnome-panel/ChangeLog	27 Apr 2005 14:14:00 -0000	1.2627
+++ gnome-panel/ChangeLog	28 Apr 2005 21:45:38 -0000
@@ -1,0 +1,7 @@
+2005-04-28  William Jon McCann  <mccann@jhu.edu>
+
+	* panel-util.c (panel_lock_screen): 
+	* panel-menu-items.c (panel_menu_items_append_lock_logout): 
+	* panel-action-button.c (panel_action_lock_invoke_menu):
+	Add gnome-screensaver support.
+
Index: gnome-panel/panel-action-button.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-action-button.c,v
retrieving revision 1.41
diff -p -u -r1.41 panel-action-button.c
--- gnome-panel/panel-action-button.c	29 Jan 2005 20:39:01 -0000	1.41
+++ gnome-panel/panel-action-button.c	28 Apr 2005 21:45:38 -0000
@@ -140,13 +140,13 @@ panel_action_lock_invoke_menu (PanelActi
 	char *command = NULL;
 
 	if (!strcmp (callback_name, "prefs"))
-		command = g_strdup ("xscreensaver-demo");
+		command = g_strdup ("gnome-screensaver-preferences");
 
 	else if (!strcmp (callback_name, "activate") ||
 		 !strcmp (callback_name, "lock") ||
 		 !strcmp (callback_name, "exit") ||
 		 !strcmp (callback_name, "restart"))
-		command = g_strdup_printf ("xscreensaver-command -%s", callback_name);
+		command = g_strdup_printf ("gnome-screensaver-command --%s", callback_name);
 
 	if (command)
 		gdk_spawn_command_line_on_screen (
Index: gnome-panel/panel-menu-items.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-menu-items.c,v
retrieving revision 1.4
diff -p -u -r1.4 panel-menu-items.c
--- gnome-panel/panel-menu-items.c	7 Apr 2005 09:05:17 -0000	1.4
+++ gnome-panel/panel-menu-items.c	28 Apr 2005 21:45:38 -0000
@@ -955,7 +955,7 @@ panel_menu_items_append_lock_logout (Gtk
 		separator_inserted = GTK_IS_SEPARATOR (GTK_WIDGET (children->data));
 	}
 
-	if (panel_is_program_in_path ("xscreensaver")) {
+	if (panel_is_program_in_path ("gnome-screensaver")) {
 		item = panel_menu_items_create_action_item (PANEL_ACTION_LOCK);
 		if (item != NULL) {
 			if (!separator_inserted) {
Index: gnome-panel/panel-util.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.c,v
retrieving revision 1.156
diff -p -u -r1.156 panel-util.c
--- gnome-panel/panel-util.c	27 Mar 2005 16:27:15 -0000	1.156
+++ gnome-panel/panel-util.c	28 Apr 2005 21:45:38 -0000
@@ -652,24 +652,24 @@ missing_pixbuf (int size)
 void
 panel_lock_screen (GdkScreen *screen)
 {
-#define XSCREENSAVER_LOCK_COMMAND "xscreensaver-command -lock"
+#define SCREENSAVER_LOCK_COMMAND "gnome-screensaver-command --lock"
 
 	GError *error = NULL;
 
 	g_return_if_fail (GDK_IS_SCREEN (screen));
 
-	if (!gdk_spawn_command_line_on_screen (screen, XSCREENSAVER_LOCK_COMMAND, &error)) {
+	if (!gdk_spawn_command_line_on_screen (screen, SCREENSAVER_LOCK_COMMAND, &error)) {
 		panel_error_dialog (screen,
 				    "cannot_exec_xscreensaver",
 				    TRUE,
 				    _("Cannot execute '%s'"),
 				    "%s",
-				    XSCREENSAVER_LOCK_COMMAND,
+				    SCREENSAVER_LOCK_COMMAND,
 				    error->message);
 		g_error_free (error);
 	}
 	
-#undef XSCREENSAVER_LOCK_COMMAND
+#undef SCREENSAVER_LOCK_COMMAND
 }
 
 
