Hard code freeze break request for Empathy (#629957)
- From: Guillaume Desmottes <gdesmott gnome org>
- To: release-team gnome org
- Subject: Hard code freeze break request for Empathy (#629957)
- Date: Mon, 20 Sep 2010 11:06:57 +0200
Hi guys,
I just fixed a crasher in Empathy and think it could be a good candidate
for 2.32.0.
https://bugzilla.gnome.org/show_bug.cgi?id=629957
G.
--
Guillaume Desmottes <gdesmott gnome org>
Jabber <cassidy jabber belnet be>
GPG 1024D/711E31B1 | 1B5A 1BA8 11AA F0F1 2169 E28A AC55 8671 711E 31B1
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 4ee188c..15dda50 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -465,8 +465,7 @@ contact_widget_details_request_cb (GObject *object,
G_CALLBACK (contact_widget_details_notify_cb), information);
}
- g_object_unref (information->details_cancellable);
- information->details_cancellable = NULL;
+ tp_clear_object (&information->details_cancellable);
}
static void
@@ -1177,9 +1176,8 @@ contact_widget_remove_contact (EmpathyContactWidget *information)
if (information->details_cancellable != NULL)
{
- /* The cancellable will be unreffed and cleared in
- * contact_widget_details_request_cb */
g_cancellable_cancel (information->details_cancellable);
+ tp_clear_object (&information->details_cancellable);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]