diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2012-11-15 17:42:59 -0500 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2012-12-13 14:56:24 -0500 |
| commit | 6b31bd402a199f4724b1dfbb9863642935f20784 (patch) | |
| tree | 959b07962f7b41e355236246d30af76a584cf28e | |
| parent | 129c729c501c26ee8f069479e96b879881f55a23 (diff) | |
| download | mutter-6b31bd402a199f4724b1dfbb9863642935f20784.tar.gz | |
display: Don't pass an event to a handler that will no-op
meta_window_handle_mouse_grab_op_event won't do anything on a
EnterNotify/LeaveNotify, so why are we passing something to it?
https://bugzilla.gnome.org/show_bug.cgi?id=688779
| -rw-r--r-- | src/core/display.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/core/display.c b/src/core/display.c index a43487b59..3aac556a7 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -2236,13 +2236,6 @@ event_callback (XEvent *event, if (display->grab_op == META_GRAB_OP_COMPOSITOR) break; - if (display->grab_window == window && - grab_op_is_mouse (display->grab_op)) - { - meta_window_handle_mouse_grab_op_event (window, event); - break; - } - /* If the mouse switches screens, active the default window on the new * screen; this will make keybindings and workspace-launched items * actually appear on the right screen. @@ -2305,10 +2298,7 @@ event_callback (XEvent *event, if (display->grab_op == META_GRAB_OP_COMPOSITOR) break; - if (display->grab_window == window && - grab_op_is_mouse (display->grab_op)) - meta_window_handle_mouse_grab_op_event (window, event); - else if (window != NULL) + if (window != NULL) { if (window->type == META_WINDOW_DOCK && event->xcrossing.mode != NotifyGrab && |