brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keybindings: Fix external grabs not being ungrabbed

Browse Source 
Before starting to use display_get_keybinding() we could compare
MetaKeyBinding.modifiers with MetaKeyCombo.modifiers directly. Now, we
need to resolve the virtual modifiers to match with the mask.
This commit is contained in:
Rui Matos 2014-03-04 20:26:49 +01:00
parent 46af3ef9f6
commit 72bd5fb814
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/keybindings.c
View File

@ -1354,6 +1354,7 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
MetaKeyBinding *binding;
MetaKeyGrab *grab;
char *key;
guint mask = 0;
g_return_val_if_fail (action != META_KEYBINDING_ACTION_NONE, FALSE);
@ -1362,9 +1363,9 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
if (!grab)
return FALSE;
binding = display_get_keybinding (display,
grab->combo->keycode,
grab->combo->modifiers);
meta_display_devirtualize_modifiers (display, grab->combo->modifiers, &mask);
binding = display_get_keybinding (display, grab->combo->keycode, mask);
if (binding)
{
guint32 index_key;