From 33adc930ad133b0d169edbf619c3692da47f9c2f Mon Sep 17 00:00:00 2001 From: rbuj Date: Tue, 5 Mar 2019 07:43:13 +0100 Subject: eel: remove g_str_list_copy GNOME/nautilus@61e2aff Replace eel_g_str_list_copy(Glist *list) with g_list_copy_deep (list, (GCopyFunc) g_strdup, NULL) --- libcaja-private/caja-file.c | 4 ++-- libcaja-private/caja-mime-actions.c | 2 +- libcaja-private/caja-query.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index 23e619f1..2d3685a5 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -7022,8 +7022,8 @@ caja_file_get_keywords (CajaFile *file) keywords = caja_file_get_metadata_list (file, CAJA_METADATA_KEY_EMBLEMS); - keywords = g_list_concat (keywords, eel_g_str_list_copy (file->details->extension_emblems)); - keywords = g_list_concat (keywords, eel_g_str_list_copy (file->details->pending_extension_emblems)); + keywords = g_list_concat (keywords, g_list_copy_deep (file->details->extension_emblems, (GCopyFunc) g_strdup, NULL)); + keywords = g_list_concat (keywords, g_list_copy_deep (file->details->pending_extension_emblems, (GCopyFunc) g_strdup, NULL)); return sort_keyword_list_and_remove_duplicates (keywords); } diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c index 3018b9f8..09e809ce 100644 --- a/libcaja-private/caja-mime-actions.c +++ b/libcaja-private/caja-mime-actions.c @@ -221,7 +221,7 @@ application_launch_parameters_new (GAppInfo *application, result = g_new0 (ApplicationLaunchParameters, 1); result->application = g_object_ref (application); - result->uris = eel_g_str_list_copy (uris); + result->uris = g_list_copy_deep (uris, (GCopyFunc) g_strdup, NULL); return result; } diff --git a/libcaja-private/caja-query.c b/libcaja-private/caja-query.c index 54c23d4e..a654eb2c 100644 --- a/libcaja-private/caja-query.c +++ b/libcaja-private/caja-query.c @@ -117,14 +117,14 @@ caja_query_set_location (CajaQuery *query, const char *uri) GList * caja_query_get_mime_types (CajaQuery *query) { - return eel_g_str_list_copy (query->details->mime_types); + return g_list_copy_deep (query->details->mime_types, (GCopyFunc) g_strdup, NULL); } void caja_query_set_mime_types (CajaQuery *query, GList *mime_types) { g_list_free_full (query->details->mime_types, g_free); - query->details->mime_types = eel_g_str_list_copy (mime_types); + query->details->mime_types = g_list_copy_deep (mime_types, (GCopyFunc) g_strdup, NULL); } void @@ -137,14 +137,14 @@ caja_query_add_mime_type (CajaQuery *query, const char *mime_type) GList * caja_query_get_tags (CajaQuery *query) { - return eel_g_str_list_copy (query->details->tags); + return g_list_copy_deep (query->details->tags, (GCopyFunc) g_strdup, NULL); } void caja_query_set_tags (CajaQuery *query, GList *tags) { g_list_free_full (query->details->tags, g_free); - query->details->tags = eel_g_str_list_copy (tags); + query->details->tags = g_list_copy_deep (tags, (GCopyFunc) g_strdup, NULL); } void -- cgit v1.2.1