12248N/A--- control-center-2.10.1/capplets/keybindings/eggcellrendererkeys.c Thu May 12 16:46:18 2005

12248N/A+++ control-center-2.10.1-new/capplets/keybindings/eggcellrendererkeys.c Fri May 13 12:14:24 2005

12248N/A@@ -430,7 +430,8 @@ grab_key_callback (GtkWidget *widget,

12248N/A GDK_BUTTON2_MASK |

12248N/A GDK_BUTTON3_MASK |

12248N/A GDK_BUTTON4_MASK |

12248N/A- GDK_BUTTON5_MASK;

12248N/A+ GDK_BUTTON5_MASK |

12248N/A+ GDK_LOCK_MASK;

12248N/A

12248N/A /* filter consumed/ignored modifiers */

12248N/A

15559N/A--- gnome-control-center-2.25.2/capplets/keybindings/gnome-keybinding-properties.c.ori 2008-11-18 09:57:04.000000000 +0000

15559N/A+++ gnome-control-center-2.25.2/capplets/keybindings/gnome-keybinding-properties.c 2008-12-24 08:44:13.101053485 +0000

15559N/A@@ -23,6 +23,7 @@

15559N/A #define MAX_CUSTOM_SHORTCUTS 1000

15559N/A #define RESPONSE_ADD 0

15559N/A #define RESPONSE_REMOVE 1

12822N/A+#define ignore_modifiers ( GDK_LOCK_MASK )

12248N/A

12248N/A typedef struct {

12248N/A char *name;

15559N/A@@ -993,6 +994,9 @@

12248N/A -1);

12248N/A

12248N/A /* no conflict for : blanks, different modifiers, or ourselves */

12248N/A+

12248N/A+ new_key->mask = new_key->mask & ~(ignore_modifiers);

12248N/A+

12248N/A if (element == NULL || new_key->mask != element->mask ||

12248N/A !strcmp (new_key->gconf_key, element->gconf_key))

12248N/A return FALSE;