fix late setting of dnd icons

This commit is contained in:
Matthias Clasen 2006-04-27 05:16:43 +00:00
parent 059292a765
commit 3a0c91edbe
3 changed files with 15 additions and 0 deletions

View File

@ -1,5 +1,9 @@
2006-04-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_set_icon_window): Handle the case
of being called after the drag is cancelled. (#339224,
Benjamin Otte)
* gdk/x11/gdkscreen-x11.c (_gdk_x11_screen_process_owner_change):
Use XFixes only if it is available. (#339839, Marko Anastasov)

View File

@ -1,5 +1,9 @@
2006-04-27 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkdnd.c (gtk_drag_set_icon_window): Handle the case
of being called after the drag is cancelled. (#339224,
Benjamin Otte)
* gdk/x11/gdkscreen-x11.c (_gdk_x11_screen_process_owner_change):
Use XFixes only if it is available. (#339839, Marko Anastasov)

View File

@ -2849,6 +2849,13 @@ gtk_drag_set_icon_window (GdkDragContext *context,
GtkDragSourceInfo *info;
info = gtk_drag_get_source_info (context, FALSE);
if (info == NULL)
{
if (destroy_on_release)
gtk_widget_destroy (widget);
return;
}
gtk_drag_remove_icon (info);
if (widget)