Home | History | Annotate | Download | only in patches
      1 --- control-center-2.16.1/capplets/keybindings/gnome-keybinding-properties.c-orig2	2006-10-20 11:41:13.804877000 +0100
      2 +++ control-center-2.16.1/capplets/keybindings/gnome-keybinding-properties.c	2006-10-20 11:46:26.155751000 +0100
      3 @@ -35,13 +35,13 @@
      4  static 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/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 },
     14 +  { "/apps/metacity/global_keybindings/logout", 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    { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 },
     18 
     19 --- control-center-2.16.1/gnome-settings-daemon/actions/acme.h-orig2	2006-10-20 11:47:54.311877000 +0100
     20 +++ control-center-2.16.1/gnome-settings-daemon/actions/acme.h	2006-10-20 11:40:13.010806000 +0100
     21 @@ -29,7 +29,6 @@
     22  	MUTE_KEY,
     23  	VOLUME_DOWN_KEY,
     24  	VOLUME_UP_KEY,
     25 -	POWER_KEY,
     26  	EJECT_KEY,
     27  	HOME_KEY,
     28  	SEARCH_KEY,
     29 @@ -60,7 +59,6 @@
     30  	{ MUTE_KEY, GCONF_BINDING_DIR "/volume_mute",NULL },
     31  	{ VOLUME_DOWN_KEY, GCONF_BINDING_DIR "/volume_down", NULL },
     32  	{ VOLUME_UP_KEY, GCONF_BINDING_DIR "/volume_up", NULL },
     33 -	{ POWER_KEY, GCONF_BINDING_DIR "/power", NULL },
     34  	{ EJECT_KEY, GCONF_BINDING_DIR "/eject", NULL },
     35  	{ HOME_KEY, GCONF_BINDING_DIR "/home", NULL },
     36  	{ SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL },
     37 
     38 --- control-center-2.16.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c-orig2	2006-10-20 11:52:22.285166000 +0100
     39 +++ control-center-2.16.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c	2006-10-20 11:40:13.013030000 +0100
     40 @@ -647,12 +647,6 @@
     41  }
     42  
     43  static void
     44 -do_exit_action (Acme *acme)
     45 -{
     46 -	execute ("gnome-session-save --kill", FALSE);
     47 -}
     48 -
     49 -static void
     50  do_eject_action (Acme *acme)
     51  {
     52  	GtkWidget *progress;
     53 @@ -757,9 +751,6 @@
     54  	case VOLUME_UP_KEY:
     55  		do_sound_action (acme, type);
     56  		break;
     57 -	case POWER_KEY:
     58 -		do_exit_action (acme);
     59 -		break;
     60  	case EJECT_KEY:
     61  		do_eject_action (acme);
     62  		break;
     63 
     64 --- control-center-2.16.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in-orig2	2006-04-27 10:50:43.000000000 +0100
     65 +++ control-center-2.16.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in	2006-10-20 11:40:13.011592000 +0100
     66 @@ -50,18 +50,6 @@
     67  
     68  
     69          <schema>
     70 -            <key>/schemas/apps/gnome_settings_daemon/keybindings/power</key>
     71 -            <applyto>/apps/gnome_settings_daemon/keybindings/power</applyto>
     72 -            <type>string</type>
     73 -            <default></default>
     74 -            <locale name="C">
     75 -                <short>Log out</short>
     76 -                <long>Log out's shortcut.</long>
     77 -            </locale>
     78 -        </schema>
     79 -
     80 -
     81 -        <schema>
     82              <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
     83              <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
     84              <type>string</type>
     85 
     86