Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/ChangeLog,v
retrieving revision 1.634
diff -u -r1.634 ChangeLog
--- ChangeLog	16 Apr 2004 02:32:36 -0000	1.634
+++ ChangeLog	20 Aug 2004 20:26:34 -0000
@@ -1,3 +1,15 @@
+2004-08-20  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix the control-center part of #141472:
+
+	The "Log out" key binding is handled in Metacity now.  The
+	keybindings capplet configures the right Gconf key.  See also the
+	capplets/keybindings/ and gnome-settings-daemon/ directories for
+	other changes.
+
+	* schemas/apps_gnome_settings_daemon_keybindings.schemas.in:
+	Removed the "/apps/gnome_settings_daemon/keybindings/power" schema.
+
 2004-04-15  Jody Goldberg <jody@gnome.org>
 
 	* Release 2.6.1
Index: capplets/keybindings/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/keybindings/ChangeLog,v
retrieving revision 1.72.2.1
diff -u -r1.72.2.1 ChangeLog
--- capplets/keybindings/ChangeLog	20 Aug 2004 16:07:15 -0000	1.72.2.1
+++ capplets/keybindings/ChangeLog	20 Aug 2004 20:26:34 -0000
@@ -1,3 +1,11 @@
+2004-08-20  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix the control-center part of #141472:
+
+	* gnome-keybinding-properties.c (desktop_key_list): Removed
+	"/apps/gnome_settings_daemon/keybindings/power", substituting it
+	by "/apps/metacity/global_keybindings/logout".
+
 2004-08-20  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* gnome-keybinding-properties.c: (setup_dialog):
Index: capplets/keybindings/gnome-keybinding-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/keybindings/gnome-keybinding-properties.c,v
retrieving revision 1.44.2.1
diff -u -r1.44.2.1 gnome-keybinding-properties.c
--- capplets/keybindings/gnome-keybinding-properties.c	20 Aug 2004 16:07:15 -0000	1.44.2.1
+++ capplets/keybindings/gnome-keybinding-properties.c	20 Aug 2004 20:26:34 -0000
@@ -42,13 +42,13 @@
 const KeyListEntry desktop_key_list[] =
 {
   { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
-  { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
   { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
+  { "/apps/metacity/global_keybindings/logout", ALWAYS_VISIBLE, 0 },
   { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
   { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
   { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
Index: gnome-settings-daemon/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/ChangeLog,v
retrieving revision 1.141.2.1
diff -u -r1.141.2.1 ChangeLog
--- gnome-settings-daemon/ChangeLog	18 Jun 2004 19:38:17 -0000	1.141.2.1
+++ gnome-settings-daemon/ChangeLog	20 Aug 2004 20:26:35 -0000
@@ -1,3 +1,17 @@
+2004-08-20  Federico Mena Quintero  <federico@ximian.com>
+
+	Fix the control-center part of #141472:
+
+	The "Log out" key binding is handled in Metacity now.  The
+	keybindings capplet configures the right Gconf key.  See also the
+	capplets/keybindings/ and schemas/ directories for other changes.
+
+	* actions/acme.h: Removed the POWER_KEY enum value.
+	(keys): Removed the entry for the power key.
+
+	* gnome-settings-multimedia-keys.c (do_exit_action): Removed.
+	(do_action): Removed the case for the POWER_KEY.
+
 2004-06-18  Crispin Flowerday  <gnome@flowerday.cx>
 
 	* gnome-settings-xsettings.c: Translate the menus_have_icons
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.6
diff -u -r1.6 gnome-settings-multimedia-keys.c
--- gnome-settings-daemon/gnome-settings-multimedia-keys.c	24 Mar 2004 02:54:32 -0000	1.6
+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	20 Aug 2004 20:26:35 -0000
@@ -643,22 +643,6 @@
 }
 
 static void
-do_exit_action (Acme *acme)
-{
-	GnomeClient *master;
-
-	master = gnome_master_client();
-	g_return_if_fail(master != NULL);
-
-	gnome_client_request_save(master,
-			GNOME_SAVE_BOTH,
-			TRUE,
-			GNOME_INTERACT_ANY,
-			FALSE,
-			TRUE);
-}
-
-static void
 do_eject_action (Acme *acme)
 {
 	GtkWidget *progress;
@@ -798,9 +782,6 @@
 	case VOLUME_DOWN_KEY:
 	case VOLUME_UP_KEY:
 		do_sound_action (acme, type);
-		break;
-	case POWER_KEY:
-		do_exit_action (acme);
 		break;
 	case EJECT_KEY:
 		do_eject_action (acme);
Index: gnome-settings-daemon/actions/acme.h
===================================================================
RCS file: /cvs/gnome/gnome-control-center/gnome-settings-daemon/actions/acme.h,v
retrieving revision 1.3
diff -u -r1.3 acme.h
--- gnome-settings-daemon/actions/acme.h	24 Mar 2004 02:54:33 -0000	1.3
+++ gnome-settings-daemon/actions/acme.h	20 Aug 2004 20:26:35 -0000
@@ -29,7 +29,6 @@
 	MUTE_KEY,
 	VOLUME_DOWN_KEY,
 	VOLUME_UP_KEY,
-	POWER_KEY,
 	EJECT_KEY,
 	HOME_KEY,
 	SEARCH_KEY,
@@ -64,7 +63,6 @@
 	{ MUTE_KEY, GCONF_BINDING_DIR "/volume_mute",NULL },
 	{ VOLUME_DOWN_KEY, GCONF_BINDING_DIR "/volume_down", NULL },
 	{ VOLUME_UP_KEY, GCONF_BINDING_DIR "/volume_up", NULL },
-	{ POWER_KEY, GCONF_BINDING_DIR "/power", NULL },
 	{ EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
 	{ HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
 	{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
Index: schemas/apps_gnome_settings_daemon_keybindings.schemas.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/schemas/apps_gnome_settings_daemon_keybindings.schemas.in,v
retrieving revision 1.2
diff -u -r1.2 apps_gnome_settings_daemon_keybindings.schemas.in
--- schemas/apps_gnome_settings_daemon_keybindings.schemas.in	14 Jan 2004 00:22:54 -0000	1.2
+++ schemas/apps_gnome_settings_daemon_keybindings.schemas.in	20 Aug 2004 20:26:35 -0000
@@ -50,18 +50,6 @@
 
 
         <schema>
-            <key>/schemas/apps/gnome_settings_daemon/keybindings/power</key>
-            <applyto>/apps/gnome_settings_daemon/keybindings/power</applyto>
-            <type>string</type>
-            <default></default>
-            <locale name="C">
-                <short>Log Out</short>
-                <long>Log Out's shortcut.</long>
-            </locale>
-        </schema>
-
-
-        <schema>
             <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
             <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
             <type>string</type>
