From b00cccb74307a49df74deb785936e3cd9cf3a5ad Mon Sep 17 00:00:00 2001
From: Jasmine Hassan <jasmine.aura@gmail.com>
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-merged-directory.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libcaja-private/caja-merged-directory.c')

diff --git a/libcaja-private/caja-merged-directory.c b/libcaja-private/caja-merged-directory.c
index a3e2a9b2..bb7ce9eb 100644
--- a/libcaja-private/caja-merged-directory.c
+++ b/libcaja-private/caja-merged-directory.c
@@ -33,6 +33,8 @@
 #include <eel/eel-gtk-macros.h>
 #include <gtk/gtk.h>
 
+#include <src/glibcompat.h> /* for g_list_free_full */
+
 struct CajaMergedDirectoryDetails
 {
     GList *directories;
@@ -589,8 +591,7 @@ real_directory_notify_files_removed (CajaDirectory *real_directory)
         caja_directory_notify_files_removed_by_uri (files);
     }
 
-    g_list_foreach(files, (GFunc) g_free, NULL);
-    g_list_free(files);
+    g_list_free_full (files, g_free);
 }
 
 static void
-- 
cgit v1.2.1