Commit 63f29381 authored by Pavel Cisler's avatar Pavel Cisler Committed by Pavel Cisler

reviewed by: John Sullivan <sullivan@eazel.com>

2001-02-07  Pavel Cisler  <pavel@eazel.com>

	reviewed by: John Sullivan  <sullivan@eazel.com>

	Fix 6380 (** ERROR ** in trash_callback_destroy when
	          navigating to trash)
	* libnautilus-extensions/nautilus-trash-file.c:
	(trash_callback_destroy), (trash_file_call_when_ready):
	Add a missing ref and unref.
parent f41814ed
2001-02-07 Pavel Cisler <pavel@eazel.com>
reviewed by: John Sullivan <sullivan@eazel.com>
Fix 6380 (** ERROR ** in trash_callback_destroy when
navigating to trash)
* libnautilus-extensions/nautilus-trash-file.c:
(trash_callback_destroy), (trash_file_call_when_ready):
Add a missing ref and unref.
2001-02-07 Gene Z. Ragan <gzr@eazel.com> 2001-02-07 Gene Z. Ragan <gzr@eazel.com>
Fixed bug 5967, Music View slider is narrow in Eazel GTK theme Fixed bug 5967, Music View slider is narrow in Eazel GTK theme
......
...@@ -101,6 +101,7 @@ trash_callback_destroy (TrashCallback *trash_callback) ...@@ -101,6 +101,7 @@ trash_callback_destroy (TrashCallback *trash_callback)
g_assert (trash_callback != NULL); g_assert (trash_callback != NULL);
g_assert (NAUTILUS_IS_TRASH_FILE (trash_callback->trash)); g_assert (NAUTILUS_IS_TRASH_FILE (trash_callback->trash));
nautilus_file_unref (NAUTILUS_FILE (trash_callback->trash));
nautilus_g_list_free_deep (trash_callback->attributes); nautilus_g_list_free_deep (trash_callback->attributes);
g_list_free (trash_callback->non_ready_files); g_list_free (trash_callback->non_ready_files);
g_free (trash_callback); g_free (trash_callback);
...@@ -312,6 +313,7 @@ trash_file_call_when_ready (NautilusFile *file, ...@@ -312,6 +313,7 @@ trash_file_call_when_ready (NautilusFile *file,
/* Create a trash_callback record. */ /* Create a trash_callback record. */
trash_callback = g_new0 (TrashCallback, 1); trash_callback = g_new0 (TrashCallback, 1);
nautilus_file_ref (file);
trash_callback->trash = trash; trash_callback->trash = trash;
trash_callback->callback = callback; trash_callback->callback = callback;
trash_callback->callback_data = callback_data; trash_callback->callback_data = callback_data;
......
...@@ -101,6 +101,7 @@ trash_callback_destroy (TrashCallback *trash_callback) ...@@ -101,6 +101,7 @@ trash_callback_destroy (TrashCallback *trash_callback)
g_assert (trash_callback != NULL); g_assert (trash_callback != NULL);
g_assert (NAUTILUS_IS_TRASH_FILE (trash_callback->trash)); g_assert (NAUTILUS_IS_TRASH_FILE (trash_callback->trash));
nautilus_file_unref (NAUTILUS_FILE (trash_callback->trash));
nautilus_g_list_free_deep (trash_callback->attributes); nautilus_g_list_free_deep (trash_callback->attributes);
g_list_free (trash_callback->non_ready_files); g_list_free (trash_callback->non_ready_files);
g_free (trash_callback); g_free (trash_callback);
...@@ -312,6 +313,7 @@ trash_file_call_when_ready (NautilusFile *file, ...@@ -312,6 +313,7 @@ trash_file_call_when_ready (NautilusFile *file,
/* Create a trash_callback record. */ /* Create a trash_callback record. */
trash_callback = g_new0 (TrashCallback, 1); trash_callback = g_new0 (TrashCallback, 1);
nautilus_file_ref (file);
trash_callback->trash = trash; trash_callback->trash = trash;
trash_callback->callback = callback; trash_callback->callback = callback;
trash_callback->callback_data = callback_data; trash_callback->callback_data = callback_data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment