# HG changeset patch # User Christian Brabandt # Date 1460919605 -7200 # Node ID fc69eed19ba746039196b1d80945aa6ea6a5f2d8 # Parent f0d7dfb136bc3d4816b01f304ed4b73261e52d88 commit https://github.com/vim/vim/commit/30e12d259ee78272359f9da2655d0593a4f6a626 Author: Bram Moolenaar Date: Sun Apr 17 20:49:53 2016 +0200 patch 7.4.1749 Problem: When using GTK 3.20 there are a few warnings. Solution: Use new functions when available. (Kazunobu Kuriyama) diff --git a/src/gui_beval.c b/src/gui_beval.c --- a/src/gui_beval.c +++ b/src/gui_beval.c @@ -557,8 +557,13 @@ target_event_cb(GtkWidget *widget, GdkEv { GdkWindow * const win = gtk_widget_get_window(widget); GdkDisplay * const dpy = gdk_window_get_display(win); +# if GTK_CHECK_VERSION(3,20,0) + GdkSeat * const seat = gdk_display_get_default_seat(dpy); + GdkDevice * const dev = gdk_seat_get_pointer(seat); +# else GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy); GdkDevice * const dev = gdk_device_manager_get_client_pointer(mngr); +# endif gdk_window_get_device_position(win, dev , &x, &y, &state); } # else diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -1842,8 +1842,13 @@ gui_gtk_get_pointer_device(GtkWidget *wi { GdkWindow * const win = gtk_widget_get_window(widget); GdkDisplay * const dpy = gdk_window_get_display(win); +# if GTK_CHECK_VERSION(3,20,0) + GdkSeat * const seat = gdk_display_get_default_seat(dpy); + return gdk_seat_get_pointer(seat); +# else GdkDeviceManager * const mngr = gdk_display_get_device_manager(dpy); return gdk_device_manager_get_client_pointer(mngr); +# endif } static GdkWindow * diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1749, +/**/ 1748, /**/ 1747,