Home | History | Annotate | Download | only in patches
      1  12862    dkenny --- control-center-2.10.1/capplets/keybindings/eggcellrendererkeys.c	Thu May 12 16:46:18 2005
      2  12862    dkenny +++ control-center-2.10.1-new/capplets/keybindings/eggcellrendererkeys.c	Fri May 13 12:14:24 2005
      3  12862    dkenny @@ -430,7 +430,8 @@ grab_key_callback (GtkWidget    *widget,
      4  12862    dkenny  			GDK_BUTTON2_MASK |
      5  12862    dkenny  			GDK_BUTTON3_MASK |
      6  12862    dkenny  			GDK_BUTTON4_MASK |
      7  12862    dkenny -			GDK_BUTTON5_MASK;
      8  12862    dkenny +			GDK_BUTTON5_MASK |
      9  12862    dkenny +			GDK_LOCK_MASK;
     10  12862    dkenny  
     11  12862    dkenny    /* filter consumed/ignored modifiers */
     12  12862    dkenny  
     13  17035   davelam --- gnome-control-center-2.25.2/capplets/keybindings/gnome-keybinding-properties.c.ori	2008-11-18 09:57:04.000000000 +0000
     14  17035   davelam +++ gnome-control-center-2.25.2/capplets/keybindings/gnome-keybinding-properties.c	2008-12-24 08:44:13.101053485 +0000
     15  17035   davelam @@ -23,6 +23,7 @@
     16  17035   davelam  #define MAX_CUSTOM_SHORTCUTS 1000
     17  17035   davelam  #define RESPONSE_ADD 0
     18  17035   davelam  #define RESPONSE_REMOVE 1
     19  12862    dkenny +#define ignore_modifiers        ( GDK_LOCK_MASK )
     20  13700  dcarbery  
     21  12862    dkenny  typedef struct {
     22  12862    dkenny    char *name;
     23  17035   davelam @@ -993,6 +994,9 @@
     24  12862    dkenny  		      -1);
     25  12862    dkenny  
     26  12862    dkenny    /* no conflict for : blanks, different modifiers, or ourselves */
     27  12862    dkenny +
     28  12862    dkenny +  new_key->mask = new_key->mask & ~(ignore_modifiers);
     29  12862    dkenny +
     30  12862    dkenny    if (element == NULL || new_key->mask != element->mask ||
     31  12862    dkenny        !strcmp (new_key->gconf_key, element->gconf_key))
     32  12862    dkenny      return FALSE;
     33