From 7024dfb18176ef0b429d0dc2768b1053546c76db Mon Sep 17 00:00:00 2001 From: raveit65 Date: Mon, 8 Aug 2016 00:15:05 +0200 Subject: GTK+-3.20 force quit: use GtkSeat instead of deprecated device pointer --- mate-panel/panel-force-quit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c index 60a35323..bc4809fd 100644 --- a/mate-panel/panel-force-quit.c +++ b/mate-panel/panel-force-quit.c @@ -114,11 +114,11 @@ remove_popup (GtkWidget *popup) GdkWindow *root; #if GTK_CHECK_VERSION (3, 0, 0) GdkDisplay *display; - GdkDevice *pointer; - GdkDevice *keyboard; #if GTK_CHECK_VERSION (3, 20, 0) GdkSeat *seat; #else + GdkDevice *pointer; + GdkDevice *keyboard; GdkDeviceManager *device_manager; #endif #endif @@ -133,15 +133,16 @@ remove_popup (GtkWidget *popup) display = gdk_window_get_display (root); #if GTK_CHECK_VERSION (3, 20, 0) seat = gdk_display_get_default_seat (display); - pointer = gdk_seat_get_pointer (seat); + + gdk_seat_ungrab (seat); #else device_manager = gdk_display_get_device_manager (display); pointer = gdk_device_manager_get_client_pointer (device_manager); -#endif keyboard = gdk_device_get_associated_device (pointer); gdk_device_ungrab (pointer, GDK_CURRENT_TIME); gdk_device_ungrab (keyboard, GDK_CURRENT_TIME); +#endif #else gdk_pointer_ungrab (GDK_CURRENT_TIME); gdk_keyboard_ungrab (GDK_CURRENT_TIME); -- cgit v1.2.1