diff options
author | Stefano Karapetsas <[email protected]> | 2012-11-23 03:09:17 -0800 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2012-11-23 03:09:17 -0800 |
commit | f6f5c1bb6d060aff5fb334017c640733675c2ae2 (patch) | |
tree | cde88ea4e11a2f0809da857feaefa6824d4ba8fa /eel/eel-glib-extensions.c | |
parent | cbfe84ee50d01e523472a8e086add01245fad6bb (diff) | |
parent | ae06676815e24a27549e0c79a74bc81c77822554 (diff) | |
download | caja-f6f5c1bb6d060aff5fb334017c640733675c2ae2.tar.bz2 caja-f6f5c1bb6d060aff5fb334017c640733675c2ae2.tar.xz |
Merge pull request #56 from jasmineaura/develop
[all] add and use glibcompat.h for glib-2.27.2 forward-compat
Diffstat (limited to 'eel/eel-glib-extensions.c')
-rw-r--r-- | eel/eel-glib-extensions.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c index 5b016aad..ee108050 100644 --- a/eel/eel-glib-extensions.c +++ b/eel/eel-glib-extensions.c @@ -38,6 +38,8 @@ #include <time.h> #include <locale.h> +#include <src/glibcompat.h> /* for g_list_free_full */ + /* Legal conversion specifiers, as specified in the C standard. */ #define C_STANDARD_STRFTIME_CHARACTERS "aAbBcdHIjmMpSUwWxXyYZ" #define C_STANDARD_NUMERIC_STRFTIME_CHARACTERS "dHIjmMSUwWyY" @@ -1034,16 +1036,11 @@ 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); - 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); + g_list_free_full (compare_list_1, g_free); + g_list_free_full (compare_list_2, g_free); + g_list_free_full (compare_list_3, g_free); + g_list_free_full (compare_list_4, g_free); + g_list_free_full (compare_list_5, g_free); /* eel_g_list_partition */ |