From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 3 May 2013 01:00:57 +0000 (-0400)
Subject: Silently handle icon being NULL
X-Git-Tag: 2.37.1~78
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d69c274e0e13294bbfd6488c220ab523d3e881a;p=platform%2Fupstream%2Fglib.git

Silently handle icon being NULL

While an emblemed icon without a base icon is not very
useful, no need to crash here.
This was crashing the object finalization test in gtk.
---

diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c
index 32e7341..6f977fd 100644
--- a/gio/gemblemedicon.c
+++ b/gio/gemblemedicon.c
@@ -72,7 +72,7 @@ g_emblemed_icon_finalize (GObject *object)
 
   emblemed = G_EMBLEMED_ICON (object);
 
-  g_object_unref (emblemed->priv->icon);
+  g_clear_object (&emblemed->priv->icon);
   g_list_free_full (emblemed->priv->emblems, g_object_unref);
 
   (*G_OBJECT_CLASS (g_emblemed_icon_parent_class)->finalize) (object);