[empathy: 2/3] contact-widget: unref the cancellable once we have cancelled the operation (#629957)



commit 348652d606e06f1871880d689ee60cae9ea707bc
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Sep 20 10:11:28 2010 +0200

    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.

 libempathy-gtk/empathy-contact-widget.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 4b21f37..15dda50 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);
     }
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]