[nautilus/alex-fazakas-duplicate-warning: 3/3] file-operations: Add autocleanup for source dir
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/alex-fazakas-duplicate-warning: 3/3] file-operations: Add autocleanup for source dir
- Date: Thu, 26 Jul 2018 13:45:23 +0000 (UTC)
commit e9f039e1a32ac0ed7de1310919a97a949f977fd1
Author: Alexandru Fazakas <alex fazakas97 gmail com>
Date: Thu Jul 26 16:17:36 2018 +0300
file-operations: Add autocleanup for source dir
Operations use a GFile which is manually unref'd immediately after.
Autocleanup makes the code looks cleaner and makes sure there are no
memory leaks.
This patch adds autocleanup for the source directory for a few
file operations.
src/nautilus-file-operations.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index d6eaef837..801f2a8f0 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -5775,7 +5775,7 @@ nautilus_file_operations_copy (GTask *task,
if (!nautilus_file_undo_manager_is_operating ())
{
- GFile *src_dir;
+ g_autoptr (GFile) src_dir = NULL;
src_dir = g_file_get_parent (job->files->data);
/* In the case of duplicate, the undo_info is already set, so we don't want to
@@ -5787,8 +5787,6 @@ nautilus_file_operations_copy (GTask *task,
g_list_length (job->files),
src_dir, job->destination);
}
-
- g_object_unref (src_dir);
}
nautilus_progress_info_start (job->common.progress);
@@ -6460,7 +6458,7 @@ nautilus_file_operations_move (GTask *task,
if (!nautilus_file_undo_manager_is_operating ())
{
- GFile *src_dir;
+ g_autoptr (GFile) src_dir = NULL;
src_dir = g_file_get_parent ((job->files)->data);
@@ -6476,8 +6474,6 @@ nautilus_file_operations_move (GTask *task,
g_list_length (job->files),
src_dir, job->destination);
}
-
- g_object_unref (src_dir);
}
common = &job->common;
@@ -6848,13 +6844,12 @@ nautilus_file_operations_link (GList *files,
if (!nautilus_file_undo_manager_is_operating ())
{
- GFile *src_dir;
+ g_autoptr (GFile) src_dir = NULL;
src_dir = g_file_get_parent (files->data);
job->common.undo_info = nautilus_file_undo_info_ext_new (NAUTILUS_FILE_UNDO_OP_CREATE_LINK,
g_list_length (files),
src_dir, target_dir);
- g_object_unref (src_dir);
}
task = g_task_new (NULL, job->common.cancellable, link_task_done, job);
@@ -6888,14 +6883,13 @@ nautilus_file_operations_duplicate (GList *files,
if (!nautilus_file_undo_manager_is_operating ())
{
- GFile *src_dir;
+ g_autoptr (GFile) src_dir = NULL;
src_dir = g_file_get_parent (files->data);
job->common.undo_info =
nautilus_file_undo_info_ext_new (NAUTILUS_FILE_UNDO_OP_DUPLICATE,
g_list_length (files),
src_dir, src_dir);
- g_object_unref (src_dir);
}
task = g_task_new (NULL, job->common.cancellable, copy_task_done, job);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]