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 /libcaja-private/caja-icon-container.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 'libcaja-private/caja-icon-container.c')
| -rw-r--r-- | libcaja-private/caja-icon-container.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index 2b38220c..10f5fc8f 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -52,6 +52,8 @@ #include <stdio.h> #include <string.h> +#include <src/glibcompat.h> /* for g_list_free_full */ + #if !GTK_CHECK_VERSION(3, 0, 0) #define gtk_scrollable_get_hadjustment gtk_layout_get_hadjustment #define gtk_scrollable_get_vadjustment gtk_layout_get_vadjustment @@ -7793,8 +7795,7 @@ caja_icon_container_update_icon (CajaIconContainer *container, /* Let the pixbufs go. */ g_object_unref (pixbuf); - g_list_foreach(emblem_pixbufs, (GFunc) g_object_unref, NULL); - g_list_free(emblem_pixbufs); + g_list_free_full (emblem_pixbufs, g_object_unref); g_free (editable_text); g_free (additional_text); |