wayland: Use zwp_pointer_gestures_v1_get_version()

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 855418c1b012ec1fdf9ff51192b51717df9cbbf8..5209f006a67bfd58f45355f05d489bc6666ff0e9 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -432,9 +432,6 @@ gdk_registry_handle_global (void               *data,
     }
   else if (strcmp (interface, "zwp_pointer_gestures_v1") == 0)
     {
-      display_wayland->pointer_gestures_version =
-          MIN (version, GDK_ZWP_POINTER_GESTURES_V1_VERSION);
-
       display_wayland->pointer_gestures =
         wl_registry_bind (display_wayland->wl_registry,
                           id, &zwp_pointer_gestures_v1_interface,

diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index e8c4080a9adc7eae6dd01fe07ad2f77e2c5ce022..2ab79b18ce65724e792a1390f4e367035ad8f691 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -134,7 +134,6 @@ struct _GdkWaylandDisplay
   GSource *event_source;
 
   int seat_version;
-  int pointer_gestures_version;
 
   uint32_t server_decoration_mode;
 

diff --git a/gdk/wayland/gdkseat-wayland.c b/gdk/wayland/gdkseat-wayland.c
index fedfd5b5deb57ea547902afdd686a9cf43f757aa..eb3c0cfb33952b0b2ae498cf16a1396dd3f2d970 100644 (file)
--- a/gdk/wayland/gdkseat-wayland.c
+++ b/gdk/wayland/gdkseat-wayland.c
@@ -2372,7 +2372,7 @@ seat_handle_capabilities (void                    *data,
           zwp_pointer_gesture_pinch_v1_add_listener (seat->wp_pointer_gesture_pinch,
                                                      &gesture_pinch_listener, seat);
 
-          if (display_wayland->pointer_gestures_version >= ZWP_POINTER_GESTURES_V1_GET_HOLD_GESTURE_SINCE_VERSION)
+          if (zwp_pointer_gestures_v1_get_version (display_wayland->pointer_gestures) >= ZWP_POINTER_GESTURES_V1_GET_HOLD_GESTURE_SINCE_VERSION)
             {
               seat->wp_pointer_gesture_hold =
                   zwp_pointer_gestures_v1_get_hold_gesture (display_wayland->pointer_gestures,