aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2012-11-29 21:22:19 +0800
committerMilan Crha <mcrha@redhat.com>2012-11-29 21:22:19 +0800
commitc073de6c4c3fac8a724bd85e570181d7b3f4bd47 (patch)
tree7247ddda264a03480c36fac36e05f6f0ee89dd25
parent19b26e86d0f995ef1b508a982a0c0ade605023b2 (diff)
downloadgsoc2013-evolution-c073de6c4c3fac8a724bd85e570181d7b3f4bd47.tar
gsoc2013-evolution-c073de6c4c3fac8a724bd85e570181d7b3f4bd47.tar.gz
gsoc2013-evolution-c073de6c4c3fac8a724bd85e570181d7b3f4bd47.tar.bz2
gsoc2013-evolution-c073de6c4c3fac8a724bd85e570181d7b3f4bd47.tar.lz
gsoc2013-evolution-c073de6c4c3fac8a724bd85e570181d7b3f4bd47.tar.xz
gsoc2013-evolution-c073de6c4c3fac8a724bd85e570181d7b3f4bd47.tar.zst
gsoc2013-evolution-c073de6c4c3fac8a724bd85e570181d7b3f4bd47.zip
Bug #687360 - Crash on quit in gtk_style_context_get_valist()
-rw-r--r--addressbook/gui/widgets/eab-contact-formatter.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 7a001cf44c..a3893188e3 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -1126,7 +1126,7 @@ eab_contact_formatter_get_property (GObject *object,
}
static void
-eab_contact_formatter_finalize (GObject *object)
+eab_contact_formatter_dispose (GObject *object)
{
EABContactFormatter *formatter;
@@ -1137,7 +1137,12 @@ eab_contact_formatter_finalize (GObject *object)
formatter->priv->contact = NULL;
}
- G_OBJECT_CLASS (eab_contact_formatter_parent_class)->finalize (object);
+ if (formatter->priv->style) {
+ g_object_unref (formatter->priv->style);
+ formatter->priv->style = NULL;
+ }
+
+ G_OBJECT_CLASS (eab_contact_formatter_parent_class)->dispose (object);
}
static void
@@ -1148,7 +1153,7 @@ eab_contact_formatter_class_init (EABContactFormatterClass *class)
g_type_class_add_private (class, sizeof (EABContactFormatterClass));
object_class = G_OBJECT_CLASS (class);
- object_class->finalize = eab_contact_formatter_finalize;
+ object_class->dispose = eab_contact_formatter_dispose;
object_class->set_property = eab_contact_formatter_set_property;
object_class->get_property = eab_contact_formatter_get_property;