projects
/
platform
/
upstream
/
glib.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a360b31
)
Silently handle icon being NULL
author
Matthias Clasen
<mclasen@redhat.com>
Fri, 3 May 2013 01:00:57 +0000
(21:00 -0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Fri, 3 May 2013 01:02:37 +0000
(21:02 -0400)
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.
gio/gemblemedicon.c
patch
|
blob
|
history
diff --git
a/gio/gemblemedicon.c
b/gio/gemblemedicon.c
index
32e7341
..
6f977fd
100644
(file)
--- 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);