Commit 699de191 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Don't leak enumerators

2008-01-23  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-file-operations.c:
	Don't leak enumerators
	
        * libnautilus-private/nautilus-trash-monitor.c:
	Don't leak file info

	Fixes from Matthias Clasen


svn path=/trunk/; revision=13643
parent 36481d7c
2008-01-23 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c:
Don't leak enumerators
* libnautilus-private/nautilus-trash-monitor.c:
Don't leak file info
Fixes from Matthias Clasen
2008-01-22 Alexander Larsson <alexl@redhat.com>
* libnautilus-extension/nautilus-column.c:
......
......@@ -1227,6 +1227,7 @@ delete_dir (CommonJob *job, GFile *dir,
g_object_unref (info);
}
g_file_enumerator_close (enumerator, job->cancellable, NULL);
g_object_unref (enumerator);
if (error && IS_IO_ERROR (error, CANCELLED)) {
g_error_free (error);
......@@ -1787,6 +1788,7 @@ dir_has_files (GFile *dir)
}
g_file_enumerator_close (enumerator, NULL, NULL);
g_object_unref (enumerator);
}
......@@ -2092,6 +2094,7 @@ scan_dir (GFile *dir,
g_object_unref (info);
}
g_file_enumerator_close (enumerator, job->cancellable, NULL);
g_object_unref (enumerator);
if (error && IS_IO_ERROR (error, CANCELLED)) {
g_error_free (error);
......@@ -2856,6 +2859,7 @@ copy_move_directory (CopyMoveJob *copy_job,
g_object_unref (info);
}
g_file_enumerator_close (enumerator, job->cancellable, NULL);
g_object_unref (enumerator);
if (error && IS_IO_ERROR (error, CANCELLED)) {
g_error_free (error);
......@@ -3023,6 +3027,7 @@ remove_target_recursively (CommonJob *job,
g_object_unref (info);
}
g_file_enumerator_close (enumerator, job->cancellable, NULL);
g_object_unref (enumerator);
} else if (IS_IO_ERROR (error, NOT_DIRECTORY)) {
/* Not a dir, continue */
......@@ -4403,6 +4408,7 @@ set_permissions_file (SetPermissionsJob *job,
g_object_unref (child_info);
}
g_file_enumerator_close (enumerator, common->cancellable, NULL);
g_object_unref (enumerator);
}
}
if (free_info) {
......@@ -4882,6 +4888,7 @@ delete_trash_file (CommonJob *job,
g_object_unref (info);
}
g_file_enumerator_close (enumerator, job->cancellable, NULL);
g_object_unref (enumerator);
}
if (!job_aborted (job) && del_dir) {
......
......@@ -128,6 +128,7 @@ update_info_cb (GObject *source_object,
signals[TRASH_STATE_CHANGED], 0,
trash_monitor->details->empty);
}
g_object_unref (info);
}
g_object_unref (trash_monitor);
......
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