diff -ur control-center-2.9.4/capplets/keybindings/gnome-keybinding-properties.c control-center-2.9.4-patched/capplets/keybindings/gnome-keybinding-properties.c
--- control-center-2.9.4/capplets/keybindings/gnome-keybinding-properties.c 2004-10-17 17:17:31.000000000 +0800
+++ control-center-2.9.4-patched/capplets/keybindings/gnome-keybinding-properties.c 2005-02-06 15:42:14.136619824 +0800
@@ -41,13 +41,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 },
diff -ur control-center-2.9.4/gnome-settings-daemon/actions/acme.h control-center-2.9.4-patched/gnome-settings-daemon/actions/acme.h
--- control-center-2.9.4/gnome-settings-daemon/actions/acme.h 2004-03-24 10:54:33.000000000 +0800
+++ control-center-2.9.4-patched/gnome-settings-daemon/actions/acme.h 2005-02-06 15:42:39.995688648 +0800
@@ -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 },
diff -ur control-center-2.9.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.9.4-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c
--- control-center-2.9.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2005-01-05 11:03:10.000000000 +0800
+++ control-center-2.9.4-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2005-02-06 15:43:33.263590696 +0800
@@ -661,12 +661,6 @@
}
static void
-do_exit_action (Acme *acme)
-{
- execute ("gnome-session-save --kill", FALSE);
-}
-
-static void
do_eject_action (Acme *acme)
{
GtkWidget *progress;
@@ -807,9 +801,6 @@
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);
break;
diff -ur control-center-2.9.4/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.9.4-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in
--- control-center-2.9.4/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2004-05-18 01:03:38.000000000 +0800
+++ control-center-2.9.4-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2005-02-06 15:46:33.028262312 +0800
@@ -50,18 +50,6 @@
- /schemas/apps/gnome_settings_daemon/keybindings/power
- /apps/gnome_settings_daemon/keybindings/power
- string
-
-
- Log out
- Log out's shortcut.
-
-
-
-
-
/schemas/apps/gnome_settings_daemon/keybindings/eject
/apps/gnome_settings_daemon/keybindings/eject
string