From 72986766f28c2dbc26cee13eff85c2b90096cd9d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Jan 2013 15:14:29 -0500 Subject: [PATCH] Deprecate e_util_copy_string_slist(). Use g_slist_copy_deep() instead, and optionally g_slist_concat() to concatenate the copied list to another GSList. --- docs/reference/libedataserver/libedataserver-sections.txt | 2 +- libedataserver/e-data-server-util.c | 4 ++++ libedataserver/e-data-server-util.h | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt index 9e12903..f97d9a4 100644 --- a/docs/reference/libedataserver/libedataserver-sections.txt +++ b/docs/reference/libedataserver/libedataserver-sections.txt @@ -1168,7 +1168,6 @@ e_utf8_strftime e_strftime e_util_slist_to_strv e_util_strv_to_slist -e_util_copy_string_slist e_util_copy_object_slist e_util_free_nullable_object_slist e_queue_transfer @@ -1203,6 +1202,7 @@ e_named_parameters_test e_util_free_string_slist e_util_free_object_slist +e_util_copy_string_slist e_named_parameters_get_type diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c index da7dbcc..07c0908 100644 --- a/libedataserver/e-data-server-util.c +++ b/libedataserver/e-data-server-util.c @@ -944,6 +944,10 @@ e_util_strv_to_slist (const gchar * const *strv) * Returned pointer can be freed with e_util_free_string_slist(). * * Since: 3.4 + * + * Deprecated: 3.8: Use g_slist_copy_deep() instead, and optionally + * g_slist_concat() to concatenate the copied list + * to another #GSList. **/ GSList * e_util_copy_string_slist (GSList *copy_to, diff --git a/libedataserver/e-data-server-util.h b/libedataserver/e-data-server-util.h index 4212c9b..bb7b107 100644 --- a/libedataserver/e-data-server-util.h +++ b/libedataserver/e-data-server-util.h @@ -73,7 +73,6 @@ gsize e_strftime (gchar *string, gchar ** e_util_slist_to_strv (const GSList *strings); GSList * e_util_strv_to_slist (const gchar * const *strv); -GSList * e_util_copy_string_slist (GSList *copy_to, const GSList *strings); GSList * e_util_copy_object_slist (GSList *copy_to, const GSList *objects); void e_util_free_nullable_object_slist (GSList *objects); @@ -166,6 +165,8 @@ gboolean e_named_parameters_test (const ENamedParameters *parameters, #ifndef EDS_DISABLE_DEPRECATED void e_util_free_string_slist (GSList *strings); void e_util_free_object_slist (GSList *objects); +GSList * e_util_copy_string_slist (GSList *copy_to, + const GSList *strings); #endif /* EDS_DISABLE_DEPRECATED */ G_END_DECLS -- 2.7.4