Magellan Linux

Contents of /trunk/control-center/patches/control-center-2.9-logout.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 144 - (show annotations) (download)
Tue May 8 20:06:05 2007 UTC (17 years ago) by niro
File size: 4083 byte(s)
-import

1 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
2 --- control-center-2.9.4/capplets/keybindings/gnome-keybinding-properties.c 2004-10-17 17:17:31.000000000 +0800
3 +++ control-center-2.9.4-patched/capplets/keybindings/gnome-keybinding-properties.c 2005-02-06 15:42:14.136619824 +0800
4 @@ -41,13 +41,13 @@
5 const KeyListEntry desktop_key_list[] =
6 {
7 { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
8 - { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 },
9 { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 },
10 { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 },
11 { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 },
12 { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 },
13 { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 },
14 { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
15 + { "/apps/metacity/global_keybindings/logout", ALWAYS_VISIBLE, 0 },
16 { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 },
17 { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 },
18 { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
19 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
20 --- control-center-2.9.4/gnome-settings-daemon/actions/acme.h 2004-03-24 10:54:33.000000000 +0800
21 +++ control-center-2.9.4-patched/gnome-settings-daemon/actions/acme.h 2005-02-06 15:42:39.995688648 +0800
22 @@ -29,7 +29,6 @@
23 MUTE_KEY,
24 VOLUME_DOWN_KEY,
25 VOLUME_UP_KEY,
26 - POWER_KEY,
27 EJECT_KEY,
28 HOME_KEY,
29 SEARCH_KEY,
30 @@ -64,7 +63,6 @@
31 { MUTE_KEY, GCONF_BINDING_DIR "/volume_mute",NULL },
32 { VOLUME_DOWN_KEY, GCONF_BINDING_DIR "/volume_down", NULL },
33 { VOLUME_UP_KEY, GCONF_BINDING_DIR "/volume_up", NULL },
34 - { POWER_KEY, GCONF_BINDING_DIR "/power", NULL },
35 { EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
36 { HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
37 { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
38 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
39 --- control-center-2.9.4/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2005-01-05 11:03:10.000000000 +0800
40 +++ control-center-2.9.4-patched/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2005-02-06 15:43:33.263590696 +0800
41 @@ -661,12 +661,6 @@
42 }
43
44 static void
45 -do_exit_action (Acme *acme)
46 -{
47 - execute ("gnome-session-save --kill", FALSE);
48 -}
49 -
50 -static void
51 do_eject_action (Acme *acme)
52 {
53 GtkWidget *progress;
54 @@ -807,9 +801,6 @@
55 case VOLUME_UP_KEY:
56 do_sound_action (acme, type);
57 break;
58 - case POWER_KEY:
59 - do_exit_action (acme);
60 - break;
61 case EJECT_KEY:
62 do_eject_action (acme);
63 break;
64 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
65 --- control-center-2.9.4/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2004-05-18 01:03:38.000000000 +0800
66 +++ control-center-2.9.4-patched/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2005-02-06 15:46:33.028262312 +0800
67 @@ -50,18 +50,6 @@
68
69
70 <schema>
71 - <key>/schemas/apps/gnome_settings_daemon/keybindings/power</key>
72 - <applyto>/apps/gnome_settings_daemon/keybindings/power</applyto>
73 - <type>string</type>
74 - <default></default>
75 - <locale name="C">
76 - <short>Log out</short>
77 - <long>Log out's shortcut.</long>
78 - </locale>
79 - </schema>
80 -
81 -
82 - <schema>
83 <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
84 <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
85 <type>string</type>