From a7c3c794df0fa9eee47fea499f7daef48a05c167 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 11 Dec 2017 00:17:36 +0100 Subject: [PATCH] dnd: Make gdk_drag_context_set_device() private There's no need to call it from GTK anymore, because we pass the device to gdk_drag_begin(). --- gdk/gdkdnd.h | 3 --- gdk/gdkdndprivate.h | 2 ++ gtk/gtkdnd.c | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gdk/gdkdnd.h b/gdk/gdkdnd.h index ccedece2d8..f830fdc69e 100644 --- a/gdk/gdkdnd.h +++ b/gdk/gdkdnd.h @@ -86,9 +86,6 @@ GType gdk_drag_context_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_3_94 GdkDisplay * gdk_drag_context_get_display (GdkDragContext *context); GDK_AVAILABLE_IN_ALL -void gdk_drag_context_set_device (GdkDragContext *context, - GdkDevice *device); -GDK_AVAILABLE_IN_ALL GdkDevice * gdk_drag_context_get_device (GdkDragContext *context); GDK_AVAILABLE_IN_3_94 diff --git a/gdk/gdkdndprivate.h b/gdk/gdkdndprivate.h index e44e49bfe8..16ad7332d4 100644 --- a/gdk/gdkdndprivate.h +++ b/gdk/gdkdndprivate.h @@ -151,6 +151,8 @@ struct _GdkDragContext { GList * gdk_drag_context_list (void); +void gdk_drag_context_set_device (GdkDragContext *context, + GdkDevice *device); void gdk_drag_context_set_cursor (GdkDragContext *context, GdkCursor *cursor); void gdk_drag_context_cancel (GdkDragContext *context, diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 08c1117b95..e613a5c1dd 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1122,8 +1122,6 @@ gtk_drag_begin_internal (GtkWidget *widget, context = gdk_drag_begin (ipc_window, pointer, target_list, start_x, start_y); - gdk_drag_context_set_device (context, pointer); - if (!gdk_drag_context_manage_dnd (context, ipc_window, actions)) { gtk_drag_release_ipc_widget (ipc_widget);