diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-27 05:16:43 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-27 05:16:43 +0000 |
| commit | 3a0c91edbe6c3fb976c5223c0de50e34464380aa (patch) | |
| tree | 4c405e77eb82448c32d34d00081f73e8d78ea020 | |
| parent | 059292a765300c6c3e3a89ffbebe0967a31b9766 (diff) | |
| download | gtk+-3a0c91edbe6c3fb976c5223c0de50e34464380aa.tar.gz | |
fix late setting of dnd icons
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkdnd.c | 7 |
3 files changed, 15 insertions, 0 deletions
@@ -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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6f23773064..b2dec19909 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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) diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 8c2d2abc76..0e11b9d767 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -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) |