From 643a6c231176d81e24ea3f3dc05d61848ea570af Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 11 Dec 2017 01:45:31 +0100 Subject: gdk: Remove gdk_drag_manage_dnd() Instead, pass the actions as part of gdk_drag_begin() and insist DND is always managed. A new side effect is that gdk_drag_begin() can now return %NULL. --- gtk/gtkdnd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gtk') diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 4eef1f2188..bec5f3bbed 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1129,12 +1129,10 @@ gtk_drag_begin_internal (GtkWidget *widget, dy = 0; } - context = gdk_drag_begin (ipc_window, pointer, target_list, dx, dy); - - if (!gdk_drag_context_manage_dnd (context, ipc_window, actions)) + context = gdk_drag_begin (ipc_window, pointer, target_list, actions, dx, dy); + if (context == NULL) { gtk_drag_release_ipc_widget (ipc_widget); - g_object_unref (context); return NULL; } -- cgit v1.2.1