diff options
| author | Pablo Barciela <[email protected]> | 2019-01-06 12:44:59 +0100 |
|---|---|---|
| committer | ZenWalker <[email protected]> | 2019-01-07 01:44:52 +0100 |
| commit | 4940310cda91a4bea223deb7568fb77829518ded (patch) | |
| tree | ceaddbf4ecb1a6fab84a1e936359cefc1c475952 /src/core/keybindings.c | |
| parent | b4dcd38a04c6ab44da5d8ac63b386419c9bda7a4 (diff) | |
| download | marco-4940310cda91a4bea223deb7568fb77829518ded.tar.bz2 marco-4940310cda91a4bea223deb7568fb77829518ded.tar.xz | |
'meta_error_trap_push' instead 'meta_error_trap_push_with_return'
both functions have the same code
Diffstat (limited to 'src/core/keybindings.c')
| -rw-r--r-- | src/core/keybindings.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/keybindings.c b/src/core/keybindings.c index 4183f7e1..6211a941 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -698,7 +698,8 @@ meta_change_keygrab (MetaDisplay *display, } if (meta_is_debugging ()) - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); + if (grab) XGrabKey (display->xdisplay, keycode, modmask | ignored_mask, @@ -779,10 +780,7 @@ static void ungrab_all_keys (MetaDisplay *display, Window xwindow) { - if (meta_is_debugging ()) - meta_error_trap_push_with_return (display); - else - meta_error_trap_push (display); + meta_error_trap_push (display); XUngrabKey (display->xdisplay, AnyKey, AnyModifier, xwindow); @@ -913,7 +911,7 @@ grab_keyboard (MetaDisplay *display, /* Grab the keyboard, so we get key releases and all key * presses */ - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); grab_status = XGrabKeyboard (display->xdisplay, xwindow, True, |