From 7a42b9b076d6b831c89bd0b9e996368c1c95aef3 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 18 Oct 2012 10:30:31 +0200 Subject: [all] use g_list_free() and g_strcmp0 instead of eel functions Was: general: use g_list_free_full() instead of eel functions http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4 . Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid unnecessary glib dependency bump to 2.28 --- eel/eel-gdk-pixbuf-extensions.c | 12 ----- eel/eel-gdk-pixbuf-extensions.h | 2 - eel/eel-glib-extensions.c | 97 +++++------------------------------------ eel/eel-glib-extensions.h | 14 ------ 4 files changed, 10 insertions(+), 115 deletions(-) (limited to 'eel') diff --git a/eel/eel-gdk-pixbuf-extensions.c b/eel/eel-gdk-pixbuf-extensions.c index fed0eb45..040855b8 100644 --- a/eel/eel-gdk-pixbuf-extensions.c +++ b/eel/eel-gdk-pixbuf-extensions.c @@ -66,18 +66,6 @@ eel_gdk_pixbuf_list_ref (GList *pixbuf_list) g_list_foreach (pixbuf_list, (GFunc) g_object_ref, NULL); } -/** - * eel_gdk_pixbuf_list_free - * @pixbuf_list: A list of GdkPixbuf objects. - * - * Unrefs all the pixbufs, then frees the list. - **/ -void -eel_gdk_pixbuf_list_free (GList *pixbuf_list) -{ - eel_g_list_free_deep_custom (pixbuf_list, (GFunc) g_object_unref, NULL); -} - GdkPixbuf * eel_gdk_pixbuf_load (const char *uri) { diff --git a/eel/eel-gdk-pixbuf-extensions.h b/eel/eel-gdk-pixbuf-extensions.h index ae649e55..07a7a0ac 100644 --- a/eel/eel-gdk-pixbuf-extensions.h +++ b/eel/eel-gdk-pixbuf-extensions.h @@ -43,8 +43,6 @@ typedef void (* EelPixbufLoadCallback) (GError *error, /* Convenience functions for lists of GdkPixbuf objects. */ void eel_gdk_pixbuf_list_ref (GList *pixbuf_list); -void eel_gdk_pixbuf_list_unref (GList *pixbuf_list); -void eel_gdk_pixbuf_list_free (GList *pixbuf_list); /* Loading a GdkPixbuf with a URI. */ diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c index ea7ecbca..63ac74a7 100644 --- a/eel/eel-glib-extensions.c +++ b/eel/eel-glib-extensions.c @@ -375,63 +375,6 @@ eel_g_str_list_index (GList *str_list, return -1; } -/** - * eel_g_list_free_deep_custom - * - * Frees the elements of a list and then the list, using a custom free function. - * - * @list: List of elements that can be freed with the provided free function. - * @element_free_func: function to call with the data pointer and user_data to free it. - * @user_data: User data to pass to element_free_func - **/ -void -eel_g_list_free_deep_custom (GList *list, GFunc element_free_func, gpointer user_data) -{ - g_list_foreach (list, element_free_func, user_data); - g_list_free (list); -} - -/** - * eel_g_list_free_deep - * - * Frees the elements of a list and then the list. - * @list: List of elements that can be freed with g_free. - **/ -void -eel_g_list_free_deep (GList *list) -{ - eel_g_list_free_deep_custom (list, (GFunc) g_free, NULL); -} - -/** - * eel_g_list_free_deep_custom - * - * Frees the elements of a list and then the list, using a custom free function. - * - * @list: List of elements that can be freed with the provided free function. - * @element_free_func: function to call with the data pointer and user_data to free it. - * @user_data: User data to pass to element_free_func - **/ -void -eel_g_slist_free_deep_custom (GSList *list, GFunc element_free_func, gpointer user_data) -{ - g_slist_foreach (list, element_free_func, user_data); - g_slist_free (list); -} - -/** - * eel_g_slist_free_deep - * - * Frees the elements of a list and then the list. - * @list: List of elements that can be freed with g_free. - **/ -void -eel_g_slist_free_deep (GSList *list) -{ - eel_g_slist_free_deep_custom (list, (GFunc) g_free, NULL); -} - - /** * eel_g_strv_find * @@ -761,31 +704,6 @@ eel_g_object_list_ref (GList *list) return list; } -/** - * eel_g_object_list_unref - * - * Unref all the objects in a list. - * @list: GList of objects. - **/ -void -eel_g_object_list_unref (GList *list) -{ - g_list_foreach (list, (GFunc) g_object_unref, NULL); -} - -/** - * eel_g_object_list_free - * - * Free a list of objects after unrefing them. - * @list: GList of objects. - **/ -void -eel_g_object_list_free (GList *list) -{ - eel_g_object_list_unref (list); - g_list_free (list); -} - /** * eel_g_object_list_copy * @@ -1214,11 +1132,16 @@ eel_self_check_glib_extensions (void) EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_4), FALSE); EEL_CHECK_BOOLEAN_RESULT (eel_g_str_list_equal (compare_list_1, compare_list_5), FALSE); - eel_g_list_free_deep (compare_list_1); - eel_g_list_free_deep (compare_list_2); - eel_g_list_free_deep (compare_list_3); - eel_g_list_free_deep (compare_list_4); - eel_g_list_free_deep (compare_list_5); + g_list_foreach (compare_list_1, (GFunc) g_free, NULL); + g_list_free(compare_list_1); + g_list_foreach (compare_list_2, (GFunc) g_free, NULL); + g_list_free(compare_list_2); + g_list_foreach (compare_list_3, (GFunc) g_free, NULL); + g_list_free(compare_list_3); + g_list_foreach (compare_list_4, (GFunc) g_free, NULL); + g_list_free(compare_list_4); + g_list_foreach (compare_list_5, (GFunc) g_free, NULL); + g_list_free(compare_list_5); /* eel_g_list_partition */ diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h index 1a8bd3e8..416ebe2f 100644 --- a/eel/eel-glib-extensions.h +++ b/eel/eel-glib-extensions.h @@ -54,18 +54,6 @@ GList * eel_g_list_partition (GList * gpointer user_data, GList **removed); -/* List functions for lists of g_free'able objects. */ -void eel_g_list_free_deep (GList *list); -void eel_g_list_free_deep_custom (GList *list, - GFunc element_free_func, - gpointer user_data); - -/* List functions for slists of g_free'able objects. */ -void eel_g_slist_free_deep (GSList *list); -void eel_g_slist_free_deep_custom (GSList *list, - GFunc element_free_func, - gpointer user_data); - /* List functions for lists of C strings. */ gboolean eel_g_str_list_equal (GList *str_list_a, GList *str_list_b); @@ -76,8 +64,6 @@ int eel_g_str_list_index (GList * /* List functions for lists of objects */ GList * eel_g_object_list_ref (GList *list); -void eel_g_object_list_unref (GList *list); -void eel_g_object_list_free (GList *list); GList * eel_g_object_list_copy (GList *list); /* GHashTable functions */ -- cgit v1.2.1