]> git.0d.be Git - empathy.git/commitdiff
contact-widget: unref the cancellable once we have cancelled the operation (#629957)
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 20 Sep 2010 08:11:28 +0000 (10:11 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 20 Sep 2010 08:11:28 +0000 (10:11 +0200)
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.

libempathy-gtk/empathy-contact-widget.c

index 4b21f374fa979d83b9480e391910ca1cf696ef0e..15dda50f3a4a591d819a42584673827dcfc0188d 100644 (file)
@@ -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);
     }
 }