From: Benjamin Otte <otte@redhat.com>
Date: Fri, 31 Mar 2023 23:57:25 +0000 (+0200)
Subject: wayland: Use wl_data_device_manager_get_version()
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~472^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9d99259cbdb11d6697b5126a0c0a518616abf2bc;p=gtk4.git

wayland: Use wl_data_device_manager_get_version()
---

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 36474c39da..f20f84ad0f 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -422,10 +422,9 @@ gdk_registry_handle_global (void               *data,
     }
   else if (strcmp (interface, "wl_data_device_manager") == 0)
     {
-      display_wayland->data_device_manager_version = MIN (version, 3);
       display_wayland->data_device_manager =
         wl_registry_bind (display_wayland->wl_registry, id, &wl_data_device_manager_interface,
-                          display_wayland->data_device_manager_version);
+                          MIN (version, 3));
     }
   else if (strcmp (interface, "wl_subcompositor") == 0)
     {
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index 80a3ef503c..78fe1fbee4 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 data_device_manager_version;
   int gtk_shell_version;
   int pointer_gestures_version;
 
diff --git a/gdk/wayland/gdkdrag-wayland.c b/gdk/wayland/gdkdrag-wayland.c
index 4af9d65e88..a9a618b5c6 100644
--- a/gdk/wayland/gdkdrag-wayland.c
+++ b/gdk/wayland/gdkdrag-wayland.c
@@ -387,7 +387,7 @@ _gdk_wayland_surface_drag_begin (GdkSurface         *surface,
 
   gdk_wayland_drag_create_data_source (drag);
 
-  if (GDK_WAYLAND_DISPLAY (display)->data_device_manager_version >= WL_DATA_SOURCE_SET_ACTIONS_SINCE_VERSION)
+  if (wl_data_device_manager_get_version (GDK_WAYLAND_DISPLAY (display)->data_device_manager) >= WL_DATA_SOURCE_SET_ACTIONS_SINCE_VERSION)
     wl_data_source_set_actions (drag_wayland->data_source, gdk_to_wl_actions (actions));
 
   gdk_wayland_seat_set_drag (seat, drag);
diff --git a/gdk/wayland/gdkdrop-wayland.c b/gdk/wayland/gdkdrop-wayland.c
index 10b6271cdd..b85cf3683b 100644
--- a/gdk/wayland/gdkdrop-wayland.c
+++ b/gdk/wayland/gdkdrop-wayland.c
@@ -128,7 +128,7 @@ gdk_wayland_drop_commit_status (GdkWaylandDrop *wayland_drop,
 
   display = gdk_drop_get_display (GDK_DROP (wayland_drop));
 
-  if (GDK_WAYLAND_DISPLAY (display)->data_device_manager_version >=
+  if (wl_data_device_manager_get_version (GDK_WAYLAND_DISPLAY (display)->data_device_manager) >=
       WL_DATA_OFFER_SET_ACTIONS_SINCE_VERSION)
     {
       uint32_t dnd_actions;
@@ -159,13 +159,12 @@ gdk_wayland_drop_finish (GdkDrop       *drop,
 {
   GdkWaylandDrop *wayland_drop = GDK_WAYLAND_DROP (drop);
   GdkDisplay *display = gdk_drop_get_display (drop);
-  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
 
   if (action)
     {
       gdk_wayland_drop_commit_status (wayland_drop, action, action);
 
-      if (display_wayland->data_device_manager_version >=
+      if (wl_data_device_manager_get_version (GDK_WAYLAND_DISPLAY (display)->data_device_manager) >=
           WL_DATA_OFFER_FINISH_SINCE_VERSION)
         wl_data_offer_finish (wayland_drop->offer);
     }