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 --- gnome-control-center-2.23.3/capplets/keybindings/gnome-keybinding-properties.c.orig	2008-06-04 15:01:11.606244738 +0100
     14 +++ gnome-control-center-2.23.3/capplets/keybindings/gnome-keybinding-properties.c	2008-06-04 15:06:10.613480712 +0100
     15 @@ -19,6 +19,7 @@
     16  
     17  #define GCONF_BINDING_DIR "/desktop/gnome/keybindings"
     18  #define MAX_ELEMENTS_BEFORE_SCROLLING 10
     19 +#define ignore_modifiers        ( GDK_LOCK_MASK )
     20  
     21  typedef struct {
     22    char *name;
     23 @@ -926,6 +927,9 @@ cb_check_for_uniqueness (GtkTreeModel *m
     24  		      -1);
     25  
     26    /* no conflict for : blanks, different modifiers, or ourselves */
     27 +
     28 +  new_key->mask = new_key->mask & ~(ignore_modifiers);
     29 +
     30    if (element == NULL || new_key->mask != element->mask ||
     31        !strcmp (new_key->gconf_key, element->gconf_key))
     32      return FALSE;
     33 
     34