aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-contact-widget.c
diff options
context:
space:
mode:
authorTravis Reitter <treitter@gmail.com>2010-07-15 04:55:07 +0800
committerTravis Reitter <treitter@gmail.com>2010-07-22 00:03:37 +0800
commitda5ec3c2bf5f816cff03932d23aec183beb18ee5 (patch)
tree1b9946b44dc4e085d3c8afd06b0d75d9c29ee64f /libempathy-gtk/empathy-contact-widget.c
parent5ee7ffd39ff228c35d0fb85aa7d55bbfe044e73f (diff)
downloadgsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar
gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.gz
gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.bz2
gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.lz
gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.xz
gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.tar.zst
gsoc2013-empathy-da5ec3c2bf5f816cff03932d23aec183beb18ee5.zip
Merge remote branch 'pwith/folks-integ-rebase1-fixes-rebase1' into folks-fixes
Diffstat (limited to 'libempathy-gtk/empathy-contact-widget.c')
-rw-r--r--libempathy-gtk/empathy-contact-widget.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 92f6c4b58..9bdad5534 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -1460,9 +1460,9 @@ 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);
- g_object_unref (information->details_cancellable);
- information->details_cancellable = NULL;
}
}