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