From: Benjamin Otte Date: Sat, 1 Apr 2023 00:06:43 +0000 (+0200) Subject: wayland: Use zwp_pointer_gestures_v1_get_version() X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~472^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6f93f52b56403ae5b466e7b257d2c189ac75c6b1;p=gtk4.git wayland: Use zwp_pointer_gestures_v1_get_version() --- diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 855418c1b0..5209f006a6 100644 --- 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 e8c4080a9a..2ab79b18ce 100644 --- 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 fedfd5b5de..eb3c0cfb33 100644 --- 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,