diff options
| author | Michael Meeks <michael@ximian.com> | 2002-05-24 08:44:23 +0000 |
|---|---|---|
| committer | Michael Meeks <michael@src.gnome.org> | 2002-05-24 08:44:23 +0000 |
| commit | 44e0b9a91af6c4f456ec7c41ecea2031467223e7 (patch) | |
| tree | 68122ddeac7861165d26b8602dfbba5f92497b0f | |
| parent | 72884ab1931f9ffe45f1811d6288890834a232f9 (diff) | |
| download | nautilus-44e0b9a91af6c4f456ec7c41ecea2031467223e7.tar.gz | |
fix proximate cause of #80896
2002-05-24 Michael Meeks <michael@ximian.com>
* libnautilus-private/nautilus-icon-dnd.c
(drag_data_received_callback): fix proximate cause of #80896
* libnautilus-private/nautilus-icon-container.c
(nautilus_icon_container_update_icon): fix proximate cause
of #78568.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-container.c | 1 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-dnd.c | 4 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2002-05-24 Michael Meeks <michael@ximian.com> + + * libnautilus-private/nautilus-icon-dnd.c + (drag_data_received_callback): fix proximate cause of #80896 + + * libnautilus-private/nautilus-icon-container.c + (nautilus_icon_container_update_icon): fix proximate cause + of #78568. + 2002-05-24 Alex Graveley <alex@ximian.com> * libnautilus-private/nautilus-monitor.c (monitor_add_internal): diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 225708012..e7c2b47b2 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -3816,6 +3816,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container, details = container->details; /* Get the icons. */ + emblem_scalable_icons = NULL; scalable_icon = nautilus_icon_container_get_icon_images ( container, icon->data, (icon == details->drop_target) ? "accept" : "", diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 0f9350f28..ba80aee40 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -1305,7 +1305,9 @@ drag_data_received_callback (GtkWidget *widget, case NAUTILUS_ICON_DND_URI_LIST: case NAUTILUS_ICON_DND_RESET_BACKGROUND: /* Save the data so we can do the actual work on drop. */ - g_assert (drag_info->selection_data == NULL); + if (drag_info->selection_data != NULL) { + gtk_selection_data_free (drag_info->selection_data); + } drag_info->selection_data = gtk_selection_data_copy (data); break; |