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
index 258ba8aeb743b19e9e22e512d976604dc7657464..9a945bc8ae0192b409e960a82f07628f36c6e1ff 100644 (file)
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -557,8 +557,13 @@ target_event_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
                {
                    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
index 00196ebe80d629bacbaf2c8ad5953add7ddf6197..77e84c1be21b87c3688b9ff5dee7a5d9bff56a63 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -1842,8 +1842,13 @@ gui_gtk_get_pointer_device(GtkWidget *widget)
 {
     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
index d26268e1efc64ab2b122e04108fb68365852f514..fa09585486b437508e3a07b2f8748e0d46879365 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1749,
 /**/
     1748,
 /**/