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 --- src/caja-navigation-window-slot.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/caja-navigation-window-slot.c') diff --git a/src/caja-navigation-window-slot.c b/src/caja-navigation-window-slot.c index 14963733..36d92808 100644 --- a/src/caja-navigation-window-slot.c +++ b/src/caja-navigation-window-slot.c @@ -31,6 +31,8 @@ #include #include +#include "glibcompat.h" /* for g_list_free_full */ + static void caja_navigation_window_slot_init (CajaNavigationWindowSlot *slot); static void caja_navigation_window_slot_class_init (CajaNavigationWindowSlotClass *class); @@ -88,8 +90,7 @@ caja_navigation_window_slot_clear_forward_list (CajaNavigationWindowSlot *slot) { g_assert (CAJA_IS_NAVIGATION_WINDOW_SLOT (slot)); - g_list_foreach(slot->forward_list, (GFunc) g_object_unref, NULL); - g_list_free(slot->forward_list); + g_list_free_full (slot->forward_list, g_object_unref); slot->forward_list = NULL; } @@ -98,8 +99,7 @@ caja_navigation_window_slot_clear_back_list (CajaNavigationWindowSlot *slot) { g_assert (CAJA_IS_NAVIGATION_WINDOW_SLOT (slot)); - g_list_foreach(slot->back_list, (GFunc) g_object_unref, NULL); - g_list_free(slot->back_list); + g_list_free_full (slot->back_list, g_object_unref); slot->back_list = NULL; } -- cgit v1.2.1