diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-23 11:18:34 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-23 11:18:34 +0200 |
| commit | b00cccb74307a49df74deb785936e3cd9cf3a5ad (patch) | |
| tree | f2bcc459a2bef12678e642d0a14ce7f02373b71d /src/file-manager/fm-list-model.c | |
| parent | b12a7f6ea3309ecddfc7e3ae839a7b558c862533 (diff) | |
| download | caja-b00cccb74307a49df74deb785936e3cd9cf3a5ad.tar.bz2 caja-b00cccb74307a49df74deb785936e3cd9cf3a5ad.tar.xz | |
[all] include src/glibcompat.h & use g_list_free_full() where needed
Also fixes a double-free regression in lc-p/caja-query from 7a42b9b0
Diffstat (limited to 'src/file-manager/fm-list-model.c')
| -rw-r--r-- | src/file-manager/fm-list-model.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c index f6ba0168..1be811f4 100644 --- a/src/file-manager/fm-list-model.c +++ b/src/file-manager/fm-list-model.c @@ -35,6 +35,7 @@ #include <libcaja-private/caja-dnd.h> #include <glib.h> +#include <src/glibcompat.h> /* for g_list_free_full */ enum { @@ -371,8 +372,7 @@ fm_list_model_get_value (GtkTreeModel *tree_model, GtkTreeIter *iter, int column g_object_unref (emblem); } - g_list_foreach (emblem_icons, (GFunc) g_object_unref, NULL); - g_list_free(emblem_icons); + g_list_free_full (emblem_icons, g_object_unref); g_object_unref (gicon); gicon = emblemed_icon; @@ -678,8 +678,7 @@ fm_list_model_get_first_iter_for_file (FMListModel *model, res = TRUE; *iter = *(GtkTreeIter *)list->data; } - g_list_foreach(list, (GFunc) g_free, NULL); - g_list_free(list); + g_list_free_full (list, g_free); return res; } @@ -1806,8 +1805,7 @@ refresh_row (gpointer data, gtk_tree_path_free (path); } - g_list_foreach(iters, (GFunc) g_free, NULL); - g_list_free(iters); + g_list_free_full (iters, g_free); } void |