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