From 26800580d62402e4b3390743205fefe2732ac394 Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 5 Mar 2019 08:17:55 +0100 Subject: eel: remove g_object_list_copy GNOME/nautilus@7af24a8 Replace GList * eel_g_object_list_copy (GList *list) with g_list_copy_deep (list, (GCopyFunc) g_object_ref, NULL) --- libcaja-private/caja-file-operations.c | 10 +++++----- libcaja-private/caja-progress-info.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c index c5223d0e..968cf5e6 100644 --- a/libcaja-private/caja-file-operations.c +++ b/libcaja-private/caja-file-operations.c @@ -2078,7 +2078,7 @@ trash_or_delete_internal (GList *files, /* TODO: special case desktop icon link files ... */ job = op_job_new (DeleteJob, parent_window, TRUE, FALSE); - job->files = eel_g_object_list_copy (files); + job->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL); job->try_trash = try_trash; job->user_cancel = FALSE; job->done_callback = done_callback; @@ -4716,7 +4716,7 @@ caja_file_operations_copy (GList *files, job->desktop_location = caja_get_desktop_location (); job->done_callback = done_callback; job->done_callback_data = done_callback_data; - job->files = eel_g_object_list_copy (files); + job->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL); job->destination = g_object_ref (target_dir); if (relative_item_points != NULL && relative_item_points->len > 0) { @@ -5258,7 +5258,7 @@ caja_file_operations_move (GList *files, job->is_move = TRUE; job->done_callback = done_callback; job->done_callback_data = done_callback_data; - job->files = eel_g_object_list_copy (files); + job->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL); job->destination = g_object_ref (target_dir); if (relative_item_points != NULL && relative_item_points->len > 0) { @@ -5577,7 +5577,7 @@ caja_file_operations_link (GList *files, job = op_job_new (CopyMoveJob, parent_window, TRUE, FALSE); job->done_callback = done_callback; job->done_callback_data = done_callback_data; - job->files = eel_g_object_list_copy (files); + job->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL); job->destination = g_object_ref (target_dir); if (relative_item_points != NULL && relative_item_points->len > 0) { @@ -5618,7 +5618,7 @@ caja_file_operations_duplicate (GList *files, job = op_job_new (CopyMoveJob, parent_window, FALSE, contains_multiple_items (files)); job->done_callback = done_callback; job->done_callback_data = done_callback_data; - job->files = eel_g_object_list_copy (files); + job->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL); job->destination = NULL; if (relative_item_points != NULL && relative_item_points->len > 0) { diff --git a/libcaja-private/caja-progress-info.c b/libcaja-private/caja-progress-info.c index dbf3db55..39eb4b71 100644 --- a/libcaja-private/caja-progress-info.c +++ b/libcaja-private/caja-progress-info.c @@ -106,7 +106,7 @@ caja_get_all_progress_info (void) G_LOCK (progress_info); - l = eel_g_object_list_copy (active_progress_infos); + l = g_list_copy_deep (active_progress_infos, (GCopyFunc) g_object_ref, NULL); G_UNLOCK (progress_info); -- cgit v1.2.1