From fb53568c043e03597d6ef6568dbf79e2004c3f13 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 2 May 2018 00:39:41 +0200 Subject: [PATCH] gdk: Remove gdk_drag_grop_succeeded() It's unused and most backends don't implement it. --- docs/reference/gdk/gdk4-sections.txt | 1 - gdk/broadway/gdkdnd-broadway.c | 9 --------- gdk/gdkdnd.c | 19 ------------------- gdk/gdkdnd.h | 3 --- gdk/gdkdndprivate.h | 1 - gdk/quartz/gdkdnd-quartz.c | 8 -------- gdk/wayland/gdkdnd-wayland.c | 7 ------- gdk/win32/gdkdnd-win32.c | 9 --------- gdk/win32/gdkdrag-win32.c | 9 --------- gdk/win32/gdkdrop-win32.c | 9 --------- gdk/x11/gdkdnd-x11.c | 8 -------- 11 files changed, 83 deletions(-) diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt index 71a23259f7..2553c35c2c 100644 --- a/docs/reference/gdk/gdk4-sections.txt +++ b/docs/reference/gdk/gdk4-sections.txt @@ -781,7 +781,6 @@ gdk_drag_begin gdk_drop_finish GdkDragAction gdk_drag_status -gdk_drag_drop_succeeded gdk_drag_context_get_display gdk_drag_context_get_actions diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c index 660c36aa74..71545c565c 100644 --- a/gdk/broadway/gdkdnd-broadway.c +++ b/gdk/broadway/gdkdnd-broadway.c @@ -149,14 +149,6 @@ _gdk_broadway_surface_register_dnd (GdkSurface *surface) { } -static gboolean -gdk_broadway_drag_context_drop_status (GdkDragContext *context) -{ - g_return_val_if_fail (context != NULL, FALSE); - - return FALSE; -} - void _gdk_broadway_display_init_dnd (GdkDisplay *display) { @@ -175,5 +167,4 @@ gdk_broadway_drag_context_class_init (GdkBroadwayDragContextClass *klass) context_class->drag_drop = gdk_broadway_drag_context_drag_drop; context_class->drop_reply = gdk_broadway_drag_context_drop_reply; context_class->drop_finish = gdk_broadway_drag_context_drop_finish; - context_class->drop_status = gdk_broadway_drag_context_drop_status; } diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index d480ea3737..a86f405c8a 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -575,25 +575,6 @@ gdk_drop_finish (GdkDragContext *context, GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_finish (context, success, time_); } -/** - * gdk_drag_drop_succeeded: - * @context: a #GdkDragContext - * - * Returns whether the dropped data has been successfully - * transferred. This function is intended to be used while - * handling a %GDK_DROP_FINISHED event, its return value is - * meaningless at other times. - * - * Returns: %TRUE if the drop was successful. - **/ -gboolean -gdk_drag_drop_succeeded (GdkDragContext *context) -{ - g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); - - return GDK_DRAG_CONTEXT_GET_CLASS (context)->drop_status (context); -} - static void gdk_drag_context_write_done (GObject *content, GAsyncResult *result, diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index 0cc1d33131..5b35f066c4 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -139,9 +139,6 @@ GdkDragContext * gdk_drag_begin (GdkSurface gint dx, gint dy); -GDK_AVAILABLE_IN_ALL -gboolean gdk_drag_drop_succeeded (GdkDragContext *context); - GDK_AVAILABLE_IN_ALL void gdk_drag_drop_done (GdkDragContext *context, gboolean success); diff --git a/gdk/gdkdndprivate.h b/gdk/gdkdndprivate.h index ee8edf8bdc..a2fa2b9996 100644 --- a/gdk/gdkdndprivate.h +++ b/gdk/gdkdndprivate.h @@ -56,7 +56,6 @@ struct _GdkDragContextClass { const char **out_mime_type, GAsyncResult *result, GError **error); - gboolean (*drop_status) (GdkDragContext *context); GdkSurface* (*get_drag_surface) (GdkDragContext *context); void (*set_hotspot) (GdkDragContext *context, gint hot_x, diff --git a/gdk/quartz/gdkdnd-quartz.c b/gdk/quartz/gdkdnd-quartz.c index f091185751..4761201017 100644 --- a/gdk/quartz/gdkdnd-quartz.c +++ b/gdk/quartz/gdkdnd-quartz.c @@ -100,13 +100,6 @@ _gdk_quartz_surface_register_dnd (GdkSurface *window) /* FIXME: Implement */ } -static gboolean -gdk_quartz_drag_context_drop_status (GdkDragContext *context) -{ - /* FIXME: Implement */ - return FALSE; -} - id gdk_quartz_drag_context_get_dragging_info_libgtk_only (GdkDragContext *context) { @@ -137,5 +130,4 @@ gdk_quartz_drag_context_class_init (GdkQuartzDragContextClass *klass) context_class->drag_drop = gdk_quartz_drag_context_drag_drop; context_class->drop_reply = gdk_quartz_drag_context_drop_reply; context_class->drop_finish = gdk_quartz_drag_context_drop_finish; - context_class->drop_status = gdk_quartz_drag_context_drop_status; } diff --git a/gdk/wayland/gdkdnd-wayland.c b/gdk/wayland/gdkdnd-wayland.c index 24d9070b1d..74d9c0e1c9 100644 --- a/gdk/wayland/gdkdnd-wayland.c +++ b/gdk/wayland/gdkdnd-wayland.c @@ -341,12 +341,6 @@ gdk_wayland_drag_context_read_finish (GdkDragContext *context, return g_task_propagate_pointer (task, error); } -static gboolean -gdk_wayland_drag_context_drop_status (GdkDragContext *context) -{ - return FALSE; -} - static void gdk_wayland_drag_context_init (GdkWaylandDragContext *context_wayland) { @@ -449,7 +443,6 @@ gdk_wayland_drag_context_class_init (GdkWaylandDragContextClass *klass) context_class->drop_finish = gdk_wayland_drag_context_drop_finish; context_class->read_async = gdk_wayland_drag_context_read_async; context_class->read_finish = gdk_wayland_drag_context_read_finish; - context_class->drop_status = gdk_wayland_drag_context_drop_status; context_class->get_drag_surface = gdk_wayland_drag_context_get_drag_surface; context_class->set_hotspot = gdk_wayland_drag_context_set_hotspot; context_class->drop_done = gdk_wayland_drag_context_drop_done; diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c index 97c753c91d..68ed58d3b3 100644 --- a/gdk/win32/gdkdnd-win32.c +++ b/gdk/win32/gdkdnd-win32.c @@ -2634,14 +2634,6 @@ _gdk_win32_surface_register_dnd (GdkSurface *window) } } -static gboolean -gdk_win32_drag_context_drop_status (GdkDragContext *context) -{ - GdkWin32DragContext *context_win32 = GDK_WIN32_DRAG_CONTEXT (context); - - return ! context_win32->drop_failed; -} - static GdkAtom gdk_win32_drag_context_get_selection (GdkDragContext *context) { @@ -3244,7 +3236,6 @@ gdk_win32_drag_context_class_init (GdkWin32DragContextClass *klass) context_class->drag_drop = gdk_win32_drag_context_drag_drop; context_class->drop_reply = gdk_win32_drag_context_drop_reply; context_class->drop_finish = gdk_win32_drag_context_drop_finish; - context_class->drop_status = gdk_win32_drag_context_drop_status; context_class->get_drag_surface = gdk_win32_drag_context_get_drag_surface; context_class->set_hotspot = gdk_win32_drag_context_set_hotspot; diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c index 830af3232f..d2e5b877b5 100644 --- a/gdk/win32/gdkdrag-win32.c +++ b/gdk/win32/gdkdrag-win32.c @@ -2279,14 +2279,6 @@ gdk_win32_drag_context_drag_abort (GdkDragContext *context, } } -static gboolean -gdk_win32_drag_context_drop_status (GdkDragContext *context) -{ - GdkWin32DragContext *context_win32 = GDK_WIN32_DRAG_CONTEXT (context); - - return ! context_win32->drop_failed; -} - static void gdk_win32_drag_context_set_cursor (GdkDragContext *context, GdkCursor *cursor) @@ -2875,7 +2867,6 @@ gdk_win32_drag_context_class_init (GdkWin32DragContextClass *klass) context_class->drag_abort = gdk_win32_drag_context_drag_abort; context_class->drag_drop = gdk_win32_drag_context_drag_drop; - context_class->drop_status = gdk_win32_drag_context_drop_status; context_class->get_drag_surface = gdk_win32_drag_context_get_drag_surface; context_class->set_hotspot = gdk_win32_drag_context_set_hotspot; diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c index b41a6cfa4b..1d9dac87f6 100644 --- a/gdk/win32/gdkdrop-win32.c +++ b/gdk/win32/gdkdrop-win32.c @@ -1019,14 +1019,6 @@ _gdk_win32_surface_register_dnd (GdkSurface *window) } } -static gboolean -gdk_win32_drop_context_drop_status (GdkDragContext *context) -{ - GdkWin32DropContext *context_win32 = GDK_WIN32_DROP_CONTEXT (context); - - return ! context_win32->drop_failed; -} - static gpointer grab_data_from_hdata (GTask *task, HANDLE hdata, @@ -1223,7 +1215,6 @@ gdk_win32_drop_context_class_init (GdkWin32DropContextClass *klass) context_class->drag_status = gdk_win32_drop_context_drag_status; context_class->drop_reply = gdk_win32_drop_context_drop_reply; context_class->drop_finish = gdk_win32_drop_context_drop_finish; - context_class->drop_status = gdk_win32_drop_context_drop_status; context_class->read_async = gdk_win32_drop_context_read_async; context_class->read_finish = gdk_win32_drop_context_read_finish; } diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index ddcd22632a..d65ed28254 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -249,7 +249,6 @@ static void gdk_x11_drag_context_drop_reply (GdkDragContext *context, static void gdk_x11_drag_context_drop_finish (GdkDragContext *context, gboolean success, guint32 time_); -static gboolean gdk_x11_drag_context_drop_status (GdkDragContext *context); static GdkSurface * gdk_x11_drag_context_get_drag_surface (GdkDragContext *context); static void gdk_x11_drag_context_set_hotspot (GdkDragContext *context, gint hot_x, @@ -405,7 +404,6 @@ gdk_x11_drag_context_class_init (GdkX11DragContextClass *klass) context_class->drag_drop = gdk_x11_drag_context_drag_drop; context_class->drop_reply = gdk_x11_drag_context_drop_reply; context_class->drop_finish = gdk_x11_drag_context_drop_finish; - context_class->drop_status = gdk_x11_drag_context_drop_status; context_class->read_async = gdk_x11_drag_context_read_async; context_class->read_finish = gdk_x11_drag_context_read_finish; context_class->get_drag_surface = gdk_x11_drag_context_get_drag_surface; @@ -2534,12 +2532,6 @@ _gdk_x11_surface_register_dnd (GdkSurface *surface) (guchar *)&xdnd_version, 1); } -static gboolean -gdk_x11_drag_context_drop_status (GdkDragContext *context) -{ - return ! GDK_X11_DRAG_CONTEXT (context)->drop_failed; -} - static GdkSurface * gdk_x11_drag_context_get_drag_surface (GdkDragContext *context) {