summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2017-12-11 01:45:31 +0100
committerBenjamin Otte <otte@redhat.com>2017-12-11 01:46:33 +0100
commit643a6c231176d81e24ea3f3dc05d61848ea570af (patch)
tree0d58e91c7e07607bedd829bb8452e3731a75068a /gtk
parent7e0844d92f10e0ef328fb79e98451e6eef92c606 (diff)
downloadgtk+-643a6c231176d81e24ea3f3dc05d61848ea570af.tar.gz
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.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkdnd.c6
1 files changed, 2 insertions, 4 deletions
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;
}