|
11506
|
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 |
|
|
14808
|
13 |
--- gnome-control-center-2.25.2/capplets/keybindings/gnome-keybinding-properties.c.ori 2008-11-18 09:57:04.000000000 +0000
|
|
|
14 |
+++ gnome-control-center-2.25.2/capplets/keybindings/gnome-keybinding-properties.c 2008-12-24 08:44:13.101053485 +0000
|
|
|
15 |
@@ -23,6 +23,7 @@
|
|
|
16 |
#define MAX_CUSTOM_SHORTCUTS 1000
|
|
|
17 |
#define RESPONSE_ADD 0
|
|
|
18 |
#define RESPONSE_REMOVE 1
|
|
12080
|
19 |
+#define ignore_modifiers ( GDK_LOCK_MASK )
|
|
11506
|
20 |
|
|
|
21 |
typedef struct {
|
|
|
22 |
char *name;
|
|
14808
|
23 |
@@ -993,6 +994,9 @@
|
|
11506
|
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;
|