summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-icon-canvas-item.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-10-18 10:30:31 +0200
committerJasmine Hassan <[email protected]>2012-11-16 09:49:19 +0200
commit7a42b9b076d6b831c89bd0b9e996368c1c95aef3 (patch)
treee878419f312aa059effcd796b11b7f84125e7ad2 /libcaja-private/caja-icon-canvas-item.c
parentdecb73c787a2709f977305a4a6da052227d7b37d (diff)
downloadcaja-7a42b9b076d6b831c89bd0b9e996368c1c95aef3.tar.bz2
caja-7a42b9b076d6b831c89bd0b9e996368c1c95aef3.tar.xz
[all] use g_list_free() and g_strcmp0 instead of eel functions
Was: general: use g_list_free_full() instead of eel functions http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4 . Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid unnecessary glib dependency bump to 2.28
Diffstat (limited to 'libcaja-private/caja-icon-canvas-item.c')
-rw-r--r--libcaja-private/caja-icon-canvas-item.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/libcaja-private/caja-icon-canvas-item.c b/libcaja-private/caja-icon-canvas-item.c
index 9f6992cf..bcec72a5 100644
--- a/libcaja-private/caja-icon-canvas-item.c
+++ b/libcaja-private/caja-icon-canvas-item.c
@@ -327,7 +327,8 @@ caja_icon_canvas_item_finalize (GObject *object)
g_object_unref (details->text_util);
}
- eel_gdk_pixbuf_list_free (details->emblem_pixbufs);
+ g_list_foreach(details->emblem_pixbufs, (GFunc) g_object_unref, NULL);
+ g_list_free(details->emblem_pixbufs);
g_free (details->editable_text);
g_free (details->additional_text);
g_free (details->attach_points);
@@ -419,7 +420,7 @@ caja_icon_canvas_item_set_property (GObject *object,
{
case PROP_EDITABLE_TEXT:
- if (eel_strcmp (details->editable_text,
+ if (g_strcmp0 (details->editable_text,
g_value_get_string (value)) == 0)
{
return;
@@ -446,7 +447,7 @@ caja_icon_canvas_item_set_property (GObject *object,
break;
case PROP_ADDITIONAL_TEXT:
- if (eel_strcmp (details->additional_text,
+ if (g_strcmp0 (details->additional_text,
g_value_get_string (value)) == 0)
{
return;
@@ -763,7 +764,8 @@ caja_icon_canvas_item_set_emblems (CajaIconCanvasItem *item,
/* Take in the new list of emblems. */
eel_gdk_pixbuf_list_ref (emblem_pixbufs);
- eel_gdk_pixbuf_list_free (item->details->emblem_pixbufs);
+ g_list_foreach(item->details->emblem_pixbufs, (GFunc) g_object_unref, NULL);
+ g_list_free(item->details->emblem_pixbufs);
item->details->emblem_pixbufs = g_list_copy (emblem_pixbufs);
caja_icon_canvas_item_invalidate_bounds_cache (item);