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-icon-canvas-item.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libcaja-private/caja-icon-canvas-item.c') diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c index 45e6f98b..b8e3fa28 100644 --- a/libcaja-private/caja-icon-canvas-item.c +++ b/libcaja-private/caja-icon-canvas-item.c @@ -50,6 +50,8 @@ #include #include +#include /* for g_list_free_full */ + #define EMBLEM_SPACING 2 /* gap between bottom of icon and start of text box */ @@ -326,8 +328,7 @@ caja_icon_canvas_item_finalize (GObject *object) g_object_unref (details->text_util); } - g_list_foreach(details->emblem_pixbufs, (GFunc) g_object_unref, NULL); - g_list_free(details->emblem_pixbufs); + g_list_free_full (details->emblem_pixbufs, g_object_unref); g_free (details->editable_text); g_free (details->additional_text); g_free (details->attach_points); @@ -763,8 +764,7 @@ caja_icon_canvas_item_set_emblems (CajaIconCanvasItem *item, /* Take in the new list of emblems. */ eel_g_object_list_ref (emblem_pixbufs); - g_list_foreach(item->details->emblem_pixbufs, (GFunc) g_object_unref, NULL); - g_list_free(item->details->emblem_pixbufs); + g_list_free_full (item->details->emblem_pixbufs, g_object_unref); item->details->emblem_pixbufs = g_list_copy (emblem_pixbufs); caja_icon_canvas_item_invalidate_bounds_cache (item); -- cgit v1.2.1