summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2012-05-03 18:01:24 +0200
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-05-03 18:06:01 +0200
commit2730edb3f0b653a3170b8b0f7e35b4c9d85e2b28 (patch)
treea00ed5a7e07407a0eb09f2c669f43c19cc056190
parentbbb1e365bf8c2c79f1bd9dc4ef972e938502abf3 (diff)
TpContact: make sure callback is cancelled if weak_object dies
In the case contacts_context_complete_in_idle() is used, it is possible that the weak object dies in the idle.
-rw-r--r--telepathy-glib/contact.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 53cc4b733..a75d990db 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -1952,6 +1952,9 @@ contacts_context_fail (ContactsContext *c,
static gboolean
contacts_context_complete (ContactsContext *c)
{
+ if (c->no_purpose_in_life)
+ return FALSE;
+
switch (c->signature)
{
case CB_BY_HANDLE: