diff options
Diffstat (limited to 'gio/gcontenttype.c')
| -rw-r--r-- | gio/gcontenttype.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c index ce8ab6cce..b817f832a 100644 --- a/gio/gcontenttype.c +++ b/gio/gcontenttype.c @@ -1063,8 +1063,7 @@ enumerate_mimetypes_dir (const char *dir, * Gets a list of strings containing all the registered content types * known to the system. The list and its data should be freed using * <programlisting> - * g_list_foreach (list, g_free, NULL); - * g_list_free (list); + * g_list_free_full (list, g_free); * </programlisting> * * Returns: (element-type utf8) (transfer full): #GList of the registered content types @@ -1130,8 +1129,7 @@ typedef struct static void tree_matchlet_free (TreeMatchlet *matchlet) { - g_list_foreach (matchlet->matches, (GFunc)tree_matchlet_free, NULL); - g_list_free (matchlet->matches); + g_list_free_full (matchlet->matches, (GDestroyNotify) tree_matchlet_free); g_free (matchlet->path); g_free (matchlet->mimetype); g_slice_free (TreeMatchlet, matchlet); @@ -1140,8 +1138,7 @@ tree_matchlet_free (TreeMatchlet *matchlet) static void tree_match_free (TreeMatch *match) { - g_list_foreach (match->matches, (GFunc)tree_matchlet_free, NULL); - g_list_free (match->matches); + g_list_free_full (match->matches, (GDestroyNotify) tree_matchlet_free); g_free (match->contenttype); g_slice_free (TreeMatch, match); } @@ -1330,8 +1327,7 @@ xdg_mime_reload (void *user_data) static void tree_magic_shutdown (void) { - g_list_foreach (tree_matches, (GFunc)tree_match_free, NULL); - g_list_free (tree_matches); + g_list_free_full (tree_matches, (GDestroyNotify) tree_match_free); tree_matches = NULL; } |