From a6cafa1edb536d4f59b33ece6090e33f54f41b1b Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Sat, 28 Mar 2015 14:16:45 +0100 Subject: [PATCH] gtkdnd: Set the icon helper from the drag site onto the context If the icon happened to come from the drag site icon helper (ie. set through gtk_drag_source_set_icon*), it would be referenced on the GtkDragInfo, but not hooked into its context. This results on non visible drag windows, until set_icon_helper() happened to be called on some path. --- gtk/gtkdnd.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 04f3d8e4b9..77ae6d739e 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -2531,7 +2531,11 @@ gtk_drag_begin_internal (GtkWidget *widget, * not have set one. */ if (!info->icon_window && !info->icon_helper) - info->icon_helper = gtk_drag_source_site_get_icon_helper (site); + { + info->icon_helper = gtk_drag_source_site_get_icon_helper (site); + set_icon_helper (info->context, info->icon_helper, + 0, 0, TRUE); + } /* We need to composite the icon into the cursor, if we are * not using an icon window.