From 7c595bcc53ff4d7d7b4595966c2a40b1d92b4413 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 2 Oct 2013 14:28:00 +0200 Subject: [PATCH] icon-theme: Use g_clear_* helpers in finalize https://bugzilla.gnome.org/show_bug.cgi?id=709264 --- gtk/gtkicontheme.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index 8345614f12..e163d438f6 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -3413,15 +3413,11 @@ gtk_icon_info_finalize (GObject *object) g_free (icon_info->filename); g_clear_object (&icon_info->icon_file); - if (icon_info->loadable) - g_object_unref (icon_info->loadable); + g_clear_object (&icon_info->loadable); g_slist_free_full (icon_info->emblem_infos, (GDestroyNotify) g_object_unref); - if (icon_info->pixbuf) - g_object_unref (icon_info->pixbuf); - if (icon_info->cache_pixbuf) - g_object_unref (icon_info->cache_pixbuf); - if (icon_info->symbolic_pixbuf_size) - gtk_requisition_free (icon_info->symbolic_pixbuf_size); + g_clear_object (&icon_info->pixbuf); + g_clear_object (&icon_info->cache_pixbuf); + g_clear_pointer (&icon_info->symbolic_pixbuf_size, gtk_requisition_free); icon_data_unref (icon_info->data); symbolic_pixbuf_cache_free (icon_info->symbolic_pixbuf_cache);