diff options
author | Jasper St. Pierre <jstpierre@mecheye.net> | 2011-10-27 16:52:21 -0400 |
---|---|---|
committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2011-10-28 15:09:21 -0400 |
commit | 3ad25a62cdca1fedeceb91f539a98f446a6920e2 (patch) | |
tree | 2e04067604a4ce1802e67d3c60e675527532c5da /src/ui | |
parent | 7ecd673d236faa6eb8e2d6bf6609328075680d67 (diff) | |
download | mutter-3ad25a62cdca1fedeceb91f539a98f446a6920e2.tar.gz |
ui: Remove deprecated stuff
https://bugzilla.gnome.org/show_bug.cgi?id=662895
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/ui.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ui/ui.c b/src/ui/ui.c index 342af0da6..8a0aad869 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -102,6 +102,7 @@ maybe_redirect_mouse_event (XEvent *xevent) { GdkDisplay *gdisplay; GdkDeviceManager *gmanager; + GdkDevice *gdevice; MetaUI *ui; GdkEvent *gevent; GdkWindow *gdk_window; @@ -133,11 +134,14 @@ maybe_redirect_mouse_event (XEvent *xevent) if (gdk_window == NULL) return FALSE; + gmanager = gdk_display_get_device_manager (gdisplay); + gdevice = gdk_device_manager_get_client_pointer (gmanager); + /* If GDK already thinks it has a grab, we better let it see events; this * is the menu-navigation case and events need to get sent to the appropriate * (client-side) subwindow for individual menu items. */ - if (gdk_display_pointer_is_grabbed (gdisplay)) + if (gdk_display_device_is_grabbed (gdisplay, gdevice)) return FALSE; switch (xevent->type) @@ -207,8 +211,7 @@ maybe_redirect_mouse_event (XEvent *xevent) } /* If we've gotten here, we've created the gdk_event and should send it on */ - gmanager = gdk_display_get_device_manager (gdisplay); - gdk_event_set_device (gevent, gdk_device_manager_get_client_pointer (gmanager)); + gdk_event_set_device (gevent, gdevice); gtk_main_do_event (gevent); gdk_event_free (gevent); |