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-clipboard.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/libcaja-private/caja-clipboard.c b/libcaja-private/caja-clipboard.c
index bce5d552..2cc61f7a 100644
--- a/libcaja-private/caja-clipboard.c
+++ b/libcaja-private/caja-clipboard.c
@@ -35,6 +35,8 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
+#include <src/glibcompat.h> /* for g_list_free_full */
+
 typedef struct _TargetCallbackData TargetCallbackData;
 
 typedef void (* SelectAllCallback)    (gpointer target);
@@ -681,7 +683,6 @@ caja_clipboard_clear_if_colliding_uris (GtkWidget *widget,
     }
 
     if (clipboard_item_uris) {
-        g_list_foreach (clipboard_item_uris, (GFunc) g_free, NULL);
-    	g_list_free(clipboard_item_uris);
+        g_list_free_full (clipboard_item_uris, g_free);
     }
 }
-- 
cgit v1.2.1