From 091e1b681e07dcbff10b91f56060b69feec7dd29 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Jan 2013 14:36:24 -0500 Subject: [PATCH] Deprecate e_util_free_string_slist(). Use g_slist_free_full() instead. --- docs/reference/libedataserver/libedataserver-sections.txt | 3 ++- libedataserver/e-data-server-util.c | 2 ++ libedataserver/e-data-server-util.h | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt index db00ae1..96517f0 100644 --- a/docs/reference/libedataserver/libedataserver-sections.txt +++ b/docs/reference/libedataserver/libedataserver-sections.txt @@ -1170,7 +1170,6 @@ e_util_slist_to_strv e_util_strv_to_slist e_util_copy_string_slist e_util_copy_object_slist -e_util_free_string_slist e_util_free_object_slist e_util_free_nullable_object_slist e_queue_transfer @@ -1202,6 +1201,8 @@ e_named_parameters_set e_named_parameters_get e_named_parameters_to_strv e_named_parameters_test + +e_util_free_string_slist e_named_parameters_get_type diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c index d326499..c4ceb49 100644 --- a/libedataserver/e-data-server-util.c +++ b/libedataserver/e-data-server-util.c @@ -988,6 +988,8 @@ e_util_copy_object_slist (GSList *copy_to, * Frees memory previously allocated by e_util_strv_to_slist(). * * Since: 3.4 + * + * Deprecated: 3.8: Use g_slist_free_full() instead. **/ void e_util_free_string_slist (GSList *strings) diff --git a/libedataserver/e-data-server-util.h b/libedataserver/e-data-server-util.h index ea14898..d1826c6 100644 --- a/libedataserver/e-data-server-util.h +++ b/libedataserver/e-data-server-util.h @@ -75,7 +75,6 @@ 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_string_slist (GSList *strings); void e_util_free_object_slist (GSList *objects); void e_util_free_nullable_object_slist (GSList *objects); @@ -165,6 +164,10 @@ gboolean e_named_parameters_test (const ENamedParameters *parameters, const gchar *value, gboolean case_sensitively); +#ifndef EDS_DISABLE_DEPRECATED +void e_util_free_string_slist (GSList *strings); +#endif /* EDS_DISABLE_DEPRECATED */ + G_END_DECLS #endif /* E_DATA_SERVER_UTIL_H */ -- 2.7.4