diff options
| author | Michael Meeks <michael@ximian.com> | 2001-11-09 06:37:02 +0000 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2001-11-09 06:37:02 +0000 |
| commit | b47cbae42da2882124bc74d28df632057c6c5f91 (patch) | |
| tree | e91f17445888a789a9d890c746b1f38732b55f64 /libnautilus-private/nautilus-icon-dnd.c | |
| parent | 4a2255079a7276551867636b356b5bcbc0aec410 (diff) | |
| download | nautilus-b47cbae42da2882124bc74d28df632057c6c5f91.tar.gz | |
return bonobo_debug_shutdown, if only we could get there.
2001-11-09 Michael Meeks <michael@ximian.com>
* src/nautilus-main.c (main): return bonobo_debug_shutdown,
if only we could get there.
* libnautilus-private/nautilus-icon-dnd.c
(nautilus_icon_dnd_fini): don't try to double free the
drag_info, allow mutliple invocations.
Diffstat (limited to 'libnautilus-private/nautilus-icon-dnd.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-dnd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 852e4e60c..f7afc2324 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -1252,9 +1252,7 @@ nautilus_icon_dnd_init (NautilusIconContainer *container, void nautilus_icon_dnd_fini (NautilusIconContainer *container) { - g_return_if_fail (container != NULL); g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container)); - g_return_if_fail (container->details->dnd_info != NULL); stop_auto_scroll (container); if (container->details->dnd_info->shadow != NULL) { @@ -1263,7 +1261,10 @@ nautilus_icon_dnd_fini (NautilusIconContainer *container) gtk_object_destroy (GTK_OBJECT (container->details->dnd_info->shadow)); } - eel_drag_finalize (&container->details->dnd_info->drag_info); + if (container->details->dnd_info != NULL) { + eel_drag_finalize (&container->details->dnd_info->drag_info); + container->details->dnd_info = NULL; + } } void |