summaryrefslogtreecommitdiff
path: root/mate-panel/menu.c
diff options
context:
space:
mode:
authorSorokin Alexei <[email protected]>2016-06-16 18:09:25 +0300
committerraveit65 <[email protected]>2016-06-29 18:42:12 +0200
commit225702b3c6a609065465c66f0f2739fc1d2184a9 (patch)
tree08c677b952074a8a79b93c9d895950bdbd85799d /mate-panel/menu.c
parentde1be3467a6ff1b350fc286025364650c8d51d1e (diff)
downloadmate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.bz2
mate-panel-225702b3c6a609065465c66f0f2739fc1d2184a9.tar.xz
fix some warnings and deprecations
Diffstat (limited to 'mate-panel/menu.c')
-rw-r--r--mate-panel/menu.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/mate-panel/menu.c b/mate-panel/menu.c
index 1a80fb02..053c077b 100644
--- a/mate-panel/menu.c
+++ b/mate-panel/menu.c
@@ -685,16 +685,25 @@ drag_end_menu_cb (GtkWidget *widget, GdkDragContext *context)
GdkDisplay *display;
GdkDevice *pointer;
GdkDevice *keyboard;
+#if GTK_CHECK_VERSION(3, 20, 0)
+ GdkSeat *seat;
+#else
GdkDeviceManager *device_manager;
#endif
+#endif
GdkWindow *window = gtk_widget_get_window (xgrab_shell);
GdkCursor *cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
GDK_ARROW);
#if GTK_CHECK_VERSION (3, 0, 0)
display = gdk_window_get_display (window);
+#if GTK_CHECK_VERSION(3, 20, 0)
+ seat = gdk_display_get_default_seat (display);
+ pointer = gdk_seat_get_pointer (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);
/* FIXMEgpoo: Not sure if report to GDK_OWNERSHIP_WINDOW