From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 10 Nov 2022 15:05:26 +0000 (+0100)
Subject: wayland: Drop create_dnd_surface
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~8^2~92^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9435e689c35bd0a06448dd353f3f359ee50247a3;p=gtk4.git

wayland: Drop create_dnd_surface

It is only used in one place.
---

diff --git a/gdk/wayland/gdkdrag-wayland.c b/gdk/wayland/gdkdrag-wayland.c
index 297225e97a..4af9d65e88 100644
--- a/gdk/wayland/gdkdrag-wayland.c
+++ b/gdk/wayland/gdkdrag-wayland.c
@@ -367,10 +367,10 @@ _gdk_wayland_surface_drag_begin (GdkSurface         *surface,
   GdkWaylandDrag *drag_wayland;
   GdkDrag *drag;
   GdkSeat *seat;
-  GdkWaylandDisplay *display_wayland;
+  GdkDisplay *display;
   GdkCursor *cursor;
 
-  display_wayland = GDK_WAYLAND_DISPLAY (gdk_device_get_display (device));
+  display = gdk_device_get_display (device);
   seat = gdk_device_get_seat (device);
 
   drag_wayland = g_object_new (GDK_TYPE_WAYLAND_DRAG,
@@ -382,17 +382,13 @@ _gdk_wayland_surface_drag_begin (GdkSurface         *surface,
 
   drag = GDK_DRAG (drag_wayland);
 
-  drag_wayland->dnd_surface = create_dnd_surface (gdk_surface_get_display (surface));
+  drag_wayland->dnd_surface = _gdk_wayland_display_create_surface (display, GDK_SURFACE_DRAG, NULL, 0, 0, 100, 100);
   drag_wayland->dnd_wl_surface = gdk_wayland_surface_get_wl_surface (drag_wayland->dnd_surface);
-  
+
   gdk_wayland_drag_create_data_source (drag);
 
-  if (display_wayland->data_device_manager_version >=
-      WL_DATA_SOURCE_SET_ACTIONS_SINCE_VERSION)
-    {
-      wl_data_source_set_actions (drag_wayland->data_source,
-                                  gdk_to_wl_actions (actions));
-    }
+  if (GDK_WAYLAND_DISPLAY (display)->data_device_manager_version >= 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/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index a551927be7..e010066a04 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -191,8 +191,6 @@ void gdk_wayland_surface_restore_shortcuts (GdkSurface *surface,
 
 void gdk_wayland_surface_update_scale (GdkSurface *surface);
 
-GdkSurface * create_dnd_surface (GdkDisplay *display);
-
 GdkModifierType gdk_wayland_keymap_get_gdk_modifiers (GdkKeymap *keymap,
                                                       guint32    mods);
 
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 03a0a39289..710082395c 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -4873,19 +4873,6 @@ gdk_wayland_surface_restore_shortcuts (GdkSurface *surface,
   g_hash_table_remove (impl->shortcuts_inhibitors, gdk_seat);
 }
 
-GdkSurface *
-create_dnd_surface (GdkDisplay *display)
-{
-  GdkSurface *surface;
-
-  surface = _gdk_wayland_display_create_surface (display,
-                                                 GDK_SURFACE_DRAG,
-                                                 NULL,
-                                                 0, 0, 100, 100);
-
-  return surface;
-}
-
 #define LAST_PROP 1
 
 static void