summaryrefslogtreecommitdiff
path: root/src/caja-property-browser.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-23 03:09:17 -0800
committerStefano Karapetsas <[email protected]>2012-11-23 03:09:17 -0800
commitf6f5c1bb6d060aff5fb334017c640733675c2ae2 (patch)
treecde88ea4e11a2f0809da857feaefa6824d4ba8fa /src/caja-property-browser.c
parentcbfe84ee50d01e523472a8e086add01245fad6bb (diff)
parentae06676815e24a27549e0c79a74bc81c77822554 (diff)
downloadcaja-f6f5c1bb6d060aff5fb334017c640733675c2ae2.tar.bz2
caja-f6f5c1bb6d060aff5fb334017c640733675c2ae2.tar.xz
Merge pull request #56 from jasmineaura/develop
[all] add and use glibcompat.h for glib-2.27.2 forward-compat
Diffstat (limited to 'src/caja-property-browser.c')
-rw-r--r--src/caja-property-browser.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/caja-property-browser.c b/src/caja-property-browser.c
index e3ee8dd7..e18e6b91 100644
--- a/src/caja-property-browser.c
+++ b/src/caja-property-browser.c
@@ -55,6 +55,8 @@
#include <libcaja-private/caja-signaller.h>
#include <atk/atkrelationset.h>
+#include "glibcompat.h" /* for g_list_free_full */
+
/* property types */
typedef enum
@@ -232,8 +234,7 @@ caja_property_browser_dispose (GObject *object)
g_free (property_browser->details->dragged_file);
g_free (property_browser->details->drag_type);
- g_list_foreach (property_browser->details->keywords, (GFunc) g_free, NULL);
- g_list_free(property_browser->details->keywords);
+ g_list_free_full (property_browser->details->keywords, g_free);
if (property_browser->details->property_chit)
{
@@ -1796,8 +1797,7 @@ make_properties_from_directories (CajaPropertyBrowser *property_browser)
if (property_browser->details->category_type == CAJA_PROPERTY_EMBLEM)
{
- g_list_foreach(property_browser->details->keywords, (GFunc) g_free, NULL);
- g_list_free(property_browser->details->keywords);
+ g_list_free_full (property_browser->details->keywords, g_free);
property_browser->details->keywords = NULL;
icons = caja_emblem_list_available ();
@@ -1851,8 +1851,7 @@ make_properties_from_directories (CajaPropertyBrowser *property_browser)
g_object_unref (object_pixbuf);
}
}
- g_list_foreach(icons, (GFunc) g_free, NULL);
- g_list_free(icons);
+ g_list_free_full (icons, g_free);
}
else
{