diff options
author | Carlos Garnacho <carlosg@gnome.org> | 2016-01-28 12:46:07 +0100 |
---|---|---|
committer | Carlos Garnacho <carlosg@gnome.org> | 2016-01-28 12:50:50 +0100 |
commit | a74db1de77f62ee36f2f9be1670eb26b621c843a (patch) | |
tree | deda51c2ef7346152e99a50c70e7a0e1e09049f8 /tests | |
parent | fef661ae84580db8b9ca7b2cb733b9c5b94e50c7 (diff) | |
download | gtk+-a74db1de77f62ee36f2f9be1670eb26b621c843a.tar.gz |
tests: Avoid deprecated API usage in testsocket
We can use seat grabs here.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/testsocket.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/tests/testsocket.c b/tests/testsocket.c index c1b59c1ef2..b250f10729 100644 --- a/tests/testsocket.c +++ b/tests/testsocket.c @@ -281,29 +281,23 @@ grab_window_toggled (GtkToggleButton *button, GtkWidget *widget) { GdkDevice *device = gtk_get_current_event_device (); - - if (gdk_device_get_source (device) != GDK_SOURCE_KEYBOARD) - device = gdk_device_get_associated_device (device); + GdkSeat *seat = gdk_device_get_seat (device); if (gtk_toggle_button_get_active (button)) { int status; - status = gdk_device_grab (device, - gtk_widget_get_window (widget), - GDK_OWNERSHIP_NONE, - FALSE, - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, - NULL, - GDK_CURRENT_TIME); + status = gdk_seat_grab (seat, gtk_widget_get_window (widget), + GDK_SEAT_CAPABILITY_KEYBOARD, + FALSE, NULL, NULL, NULL, NULL); if (status != GDK_GRAB_SUCCESS) g_warning ("Could not grab keyboard! (%s)", grab_string (status)); - } - else + } + else { - gdk_device_ungrab (device, GDK_CURRENT_TIME); + gdk_seat_ungrab (seat); } } |