diff options
| author | Bastien Nocera <hadess@hadess.net> | 2011-10-27 11:09:26 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2011-10-28 12:03:22 +0100 |
| commit | 0888e6f4854507600bdb72fe2eea65496be98407 (patch) | |
| tree | 49c50921a51f33b66d3f7c8a97dc5de8db370a03 /gtk/gtkdnd.c | |
| parent | 701c00e8cf79e88d3bc2e1a138ec1592d69ebc78 (diff) | |
| download | gtk+-0888e6f4854507600bdb72fe2eea65496be98407.tar.gz | |
gtk: Fix XIGrabKeycode usage
A modifier of "0" is still a modifier and must be submitted normally.
A num_modifiers of 0 is essentially a noop in the server.
As mentioned by Peter Hutterer <peter.hutterer@who-t.net>
https://bugzilla.gnome.org/show_bug.cgi?id=662839
Diffstat (limited to 'gtk/gtkdnd.c')
| -rw-r--r-- | gtk/gtkdnd.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 1b8baa45da..e1164252a5 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -513,13 +513,8 @@ grab_dnd_keys (GtkWidget *widget, evmask.mask_len = sizeof (mask); evmask.mask = mask; - if (grab_keys[i].modifiers != 0) - { - num_mods = 1; - mods.modifiers = grab_keys[i].modifiers; - } - else - num_mods = 0; + num_mods = 1; + mods.modifiers = grab_keys[i].modifiers; XIGrabKeycode (GDK_WINDOW_XDISPLAY (window), deviceid, @@ -591,13 +586,8 @@ ungrab_dnd_keys (GtkWidget *widget, #ifdef XINPUT_2 if (using_xi2) { - if (grab_keys[i].modifiers != 0) - { - num_mods = 1; - mods.modifiers = grab_keys[i].modifiers; - } - else - num_mods = 0; + num_mods = 1; + mods.modifiers = grab_keys[i].modifiers; XIUngrabKeycode (GDK_WINDOW_XDISPLAY (window), deviceid, |