From b00cccb74307a49df74deb785936e3cd9cf3a5ad Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Fri, 23 Nov 2012 11:18:34 +0200 Subject: [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 --- libcaja-private/caja-emblem-utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libcaja-private/caja-emblem-utils.c') diff --git a/libcaja-private/caja-emblem-utils.c b/libcaja-private/caja-emblem-utils.c index dd70dbc3..f837df69 100644 --- a/libcaja-private/caja-emblem-utils.c +++ b/libcaja-private/caja-emblem-utils.c @@ -43,6 +43,8 @@ #include "caja-file.h" #include "caja-emblem-utils.h" +#include /* for g_list_free_full */ + #define EMBLEM_NAME_TRASH "emblem-trash" #define EMBLEM_NAME_SYMLINK "emblem-symbolic-link" #define EMBLEM_NAME_NOREAD "emblem-noread" @@ -119,8 +121,7 @@ is_reserved_keyword (const char *keyword) result = g_list_find_custom (available, (char *) icon_name, (GCompareFunc) g_ascii_strcasecmp) != NULL; - g_list_foreach(available, (GFunc) g_free, NULL); - g_list_free(available); + g_list_free_full (available, g_free); g_free (icon_name); return result; } -- cgit v1.2.1