diff options
| author | Jasmine Hassan <[email protected]> | 2012-11-23 11:18:34 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-23 11:18:34 +0200 |
| commit | b00cccb74307a49df74deb785936e3cd9cf3a5ad (patch) | |
| tree | f2bcc459a2bef12678e642d0a14ce7f02373b71d /src/caja-property-browser.c | |
| parent | b12a7f6ea3309ecddfc7e3ae839a7b558c862533 (diff) | |
| download | caja-b00cccb74307a49df74deb785936e3cd9cf3a5ad.tar.bz2 caja-b00cccb74307a49df74deb785936e3cd9cf3a5ad.tar.xz | |
[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
Diffstat (limited to 'src/caja-property-browser.c')
| -rw-r--r-- | src/caja-property-browser.c | 11 |
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 { |