Home | History | Annotate | Download | only in patches
      1 --- control-center-2.10.1/capplets/keybindings/eggcellrendererkeys.c	Thu May 12 16:46:18 2005
      2 +++ control-center-2.10.1-new/capplets/keybindings/eggcellrendererkeys.c	Fri May 13 12:14:24 2005
      3 @@ -430,7 +430,8 @@ grab_key_callback (GtkWidget    *widget,
      4  			GDK_BUTTON2_MASK |
      5  			GDK_BUTTON3_MASK |
      6  			GDK_BUTTON4_MASK |
      7 -			GDK_BUTTON5_MASK;
      8 +			GDK_BUTTON5_MASK |
      9 +			GDK_LOCK_MASK;
     10  
     11    /* filter consumed/ignored modifiers */
     12  
     13 --- control-center-2.10.1/capplets/keybindings/gnome-keybinding-properties.c	Fri May 13 12:12:07 2005
     14 +++ control-center-2.10.1-new/capplets/keybindings/gnome-keybinding-properties.c	Fri May 13 12:14:25 2005
     15 @@ -26,6 +26,9 @@
     16 
     17  #define LABEL_DATA "gnome-keybinding-properties-label"
     18  #define MAX_ELEMENTS_BEFORE_SCROLLING 10
     19 +
     20 +#define ignore_modifiers       ( GDK_LOCK_MASK )
     21 +
     22  static const KeyListEntry desktop_key_list[] =
     23  {
     24    { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 },
     25 @@ -641,6 +644,9 @@ cb_check_for_uniqueness (GtkTreeModel *m
     26  		      -1);
     27  
     28    /* no conflict for : blanks, different modifiers, or ourselves */
     29 +
     30 +  new_key->mask = new_key->mask & ~(ignore_modifiers);
     31 +
     32    if (element == NULL || new_key->mask != element->mask ||
     33        !strcmp (new_key->gconf_key, element->gconf_key))
     34      return FALSE;
     35