--- a/patches/control-center-07-logout-shortcut.diff Fri Jul 14 17:27:04 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
---- control-center-2.10.1/capplets/keybindings/gnome-keybinding-properties.c Fri May 13 10:16:36 2005
-+++ control-center-2.10.1-new/capplets/keybindings/gnome-keybinding-properties.c Fri May 13 10:58:51 2005
-@@ -41,12 +41,12 @@ typedef struct
- 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/metacity/global_keybindings/logout", ALWAYS_VISIBLE, 0 },
- { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
- { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
- { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
---- control-center-2.10.1/gnome-settings-daemon/actions/acme.h Thu May 12 16:46:32 2005
-+++ control-center-2.10.1-new/gnome-settings-daemon/actions/acme.h Fri May 13 10:59:14 2005
-@@ -29,7 +29,6 @@ enum {
- MUTE_KEY,
- VOLUME_DOWN_KEY,
- VOLUME_UP_KEY,
-- POWER_KEY,
- EJECT_KEY,
- HOME_KEY,
- SEARCH_KEY,
-@@ -64,7 +63,6 @@ static struct {
- { 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 },
---- control-center-2.10.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in Thu May 12 16:46:32 2005
-+++ control-center-2.10.1-new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in Fri May 13 11:43:43 2005
-@@ -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>
---- control-center-2.10.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c Thu May 12 16:46:31 2005
-+++ control-center-2.10.1-new/gnome-settings-daemon/gnome-settings-multimedia-keys.c Fri May 13 11:42:17 2005
-@@ -661,12 +661,6 @@ do_www_action (Acme *acme, const char *u
- }
-
- static void
--do_exit_action (Acme *acme)
--{
-- execute ("gnome-session-save --kill", FALSE);
--}
--
--static void
- do_eject_action (Acme *acme)
- {
- GtkWidget *progress;
-@@ -806,9 +800,6 @@ do_action (Acme *acme, int type)
- 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);