summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlli Salli <ollisal@gmail.com>2011-01-03 14:58:08 +0200
committerOlli Salli <ollisal@gmail.com>2011-01-03 14:58:08 +0200
commita1594809eb4afddf97453e16c06969cbb3b91041 (patch)
tree5efe640acbc81e03166ab1716e09a4c692ab2a16
parente805895e3dd77dc92ebf83295e44d60c78d6ca21 (diff)
Conn.I.ContactList test CM: don't accept subscription requests if they're canceled
-rw-r--r--tests/lib/glib/contactlist2/contact-list.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/lib/glib/contactlist2/contact-list.c b/tests/lib/glib/contactlist2/contact-list.c
index fec9afe7..bdefc149 100644
--- a/tests/lib/glib/contactlist2/contact-list.c
+++ b/tests/lib/glib/contactlist2/contact-list.c
@@ -883,6 +883,10 @@ receive_authorized (gpointer p)
if (d->subscribe)
return FALSE;
+ /* DITTO, if our subscription request was cancelled in the meantime */
+ if (!d->subscribe_requested)
+ return FALSE;
+
d->subscribe_requested = FALSE;
d->subscribe_rejected = FALSE;
d->subscribe = TRUE;