diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-20 17:35:38 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-20 17:35:38 +0800 |
| commit | 57cd2fba705b470cb37afdc6d8a8984de4aa8da7 (patch) | |
| tree | 35f1264171f1fd85cc01b51d9c274fafa3a3d496 | |
| parent | 731955864482940ec2fc537c734a1c9b7f381f81 (diff) | |
| parent | 348652d606e06f1871880d689ee60cae9ea707bc (diff) | |
| download | gsoc2013-empathy-57cd2fba705b470cb37afdc6d8a8984de4aa8da7.tar gsoc2013-empathy-57cd2fba705b470cb37afdc6d8a8984de4aa8da7.tar.gz gsoc2013-empathy-57cd2fba705b470cb37afdc6d8a8984de4aa8da7.tar.bz2 gsoc2013-empathy-57cd2fba705b470cb37afdc6d8a8984de4aa8da7.tar.lz gsoc2013-empathy-57cd2fba705b470cb37afdc6d8a8984de4aa8da7.tar.xz gsoc2013-empathy-57cd2fba705b470cb37afdc6d8a8984de4aa8da7.tar.zst gsoc2013-empathy-57cd2fba705b470cb37afdc6d8a8984de4aa8da7.zip | |
Merge branch 'cancel-crash-629957'
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 4ee188cdd..15dda50f3 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); } } |