summaryrefslogtreecommitdiff
path: root/gtk/gtkdnd.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-12-19 08:09:06 +0100
committerBenjamin Otte <otte@redhat.com>2016-01-11 16:56:16 +0100
commitfa7816d99c70a759d67ddc09bc2cadf7cf2a29dd (patch)
tree21d369dbe3e564e6c046f0fe79768b61a5330562 /gtk/gtkdnd.c
parentfb0a628975581cc7c6949ae0cde42557010a8ee5 (diff)
downloadgtk+-fa7816d99c70a759d67ddc09bc2cadf7cf2a29dd.tar.gz
dnd: When setting a dnd icon widget, unset old one
Setting a DND icon twice should actually work and not cause warnings the 2nd time.
Diffstat (limited to 'gtk/gtkdnd.c')
-rw-r--r--gtk/gtkdnd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 0907fd9116..c4fd666c35 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -2485,6 +2485,8 @@ gtk_drag_set_icon_widget_internal (GdkDragContext *context,
gtk_widget_show (widget);
}
+ if (gtk_bin_get_child (GTK_BIN (info->icon_window)))
+ gtk_container_remove (GTK_CONTAINER (info->icon_window), gtk_bin_get_child (GTK_BIN (info->icon_window)));
gtk_container_add (GTK_CONTAINER (info->icon_window), widget);
out: