2004-10-06 Vinay M R <
[email protected]>
* control-center.spec: Update.
* metacity.spec: Update.
* patches/control-center-19-logout-shorcut.diff:
* patches/metacity-07-logout-shortcut.diff:
Provide user an option to assign shortcut to logout.
Fixes bug #5101706.
--- control-center-2.6.1/capplets/keybindings/gnome-keybinding-properties.c 2004-09-28 18:44:26.000000000 +0530
+++ control-center-2.6.1-new/capplets/keybindings/gnome-keybinding-properties.c 2004-09-28 18:49:13.000000000 +0530
@@ -42,12 +42,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.6.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-09-28 18:44:32.000000000 +0530
+++ control-center-2.6.1-new/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2004-09-28 19:47:18.000000000 +0530
@@ -643,22 +643,6 @@ do_www_action (Acme *acme, const char *u
}
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;
@@ -799,9 +783,6 @@ do_action (Acme *acme, int type)
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;
--- control-center-2.6.1/gnome-settings-daemon/actions/acme.h 2004-09-28 18:44:32.000000000 +0530
+++ control-center-2.6.1-new/gnome-settings-daemon/actions/acme.h 2004-09-28 19:48:07.000000000 +0530
@@ -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.6.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2004-09-28 18:44:21.000000000 +0530
+++ control-center-2.6.1-new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2004-09-28 18:52:06.000000000 +0530
@@ -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>