aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-20 16:11:28 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-20 16:11:28 +0800
commit348652d606e06f1871880d689ee60cae9ea707bc (patch)
treee4e80cf91c9cda83f4e8a2d352d56d66b2a8ef80
parent2ebd2e1cd78a2bb2d45f7cff51cbb590b07b366f (diff)
downloadgsoc2013-empathy-348652d606e06f1871880d689ee60cae9ea707bc.tar
gsoc2013-empathy-348652d606e06f1871880d689ee60cae9ea707bc.tar.gz
gsoc2013-empathy-348652d606e06f1871880d689ee60cae9ea707bc.tar.bz2
gsoc2013-empathy-348652d606e06f1871880d689ee60cae9ea707bc.tar.lz
gsoc2013-empathy-348652d606e06f1871880d689ee60cae9ea707bc.tar.xz
gsoc2013-empathy-348652d606e06f1871880d689ee60cae9ea707bc.tar.zst
gsoc2013-empathy-348652d606e06f1871880d689ee60cae9ea707bc.zip
contact-widget: unref the cancellable once we have cancelled the operation (#629957)
The comment was a lie, contact_widget_details_request_cb early returns when the operation has been cancelled so it wasn't unset. There is no point waiting any way so we can unref it right away.
-rw-r--r--libempathy-gtk/empathy-contact-widget.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 4b21f374f..15dda50f3 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1176,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);
}
}