[next] telepathy-glib: TpChannel: MembersChanged' s details does not always need contact-ids

Xavier Claessens xclaesse at kemper.freedesktop.org
Wed May 9 13:10:46 PDT 2012


Module: telepathy-glib
Branch: next
Commit: 822748c0769a57a485e909cc163ab4b1fc998524
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=822748c0769a57a485e909cc163ab4b1fc998524

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Fri May  4 09:18:46 2012 +0200

TpChannel: MembersChanged's details does not always need contact-ids

For removal-only signal, CM could omit it.

---

 telepathy-glib/channel-contacts.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/channel-contacts.c b/telepathy-glib/channel-contacts.c
index f21e44d..05beac3 100644
--- a/telepathy-glib/channel-contacts.c
+++ b/telepathy-glib/channel-contacts.c
@@ -644,7 +644,8 @@ _tp_channel_contacts_members_changed (TpChannel *self,
 
   ids = tp_asv_get_boxed (details, "contact-ids",
       TP_HASH_TYPE_HANDLE_IDENTIFIER_MAP);
-  if (ids == NULL)
+  if (ids == NULL && (added->len > 0 || local_pending->len > 0 ||
+      remote_pending->len > 0 || actor != 0 ))
     {
       DEBUG ("CM did not give identifiers, can't create TpContact");
       return;



More information about the telepathy-commits mailing list