Changeset 8f8a56f for protocols/jabber/conference.c

Timestamp:

2016-03-20T03:58:05Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

3c3b916

Parents:

a42fda4

git-author:

dequis <dx@…> (24-01-16 13:22:08)

git-committer:

dequis <dx@…> (20-03-16 03:58:05)

Message:

jabber: Check for other resources before removing someone from a chat

So if someone has several connections with several clients to a chat,
they won't appear as leaving from the chat until they leave from the
last client.

File:

• protocols/jabber/conference.c (modified) (2 diffs)

protocols/jabber/conference.c

@@ -244 +244 @@
 }
 
+static int jabber_chat_has_other_resources(struct im_connection *ic, struct jabber_buddy *bud)
+{
+        struct jabber_buddy *cur;
+
+        for (cur = jabber_buddy_by_jid(ic, bud->bare_jid, GET_BUDDY_FIRST); cur; cur = cur->next) {
+                if (cur != bud && jabber_compare_jid(cur->ext_jid, bud->ext_jid)) {
+                        return TRUE;
+                }
+        }
+        
+        return FALSE;
+}
+
 /* Not really the same syntax as the normal pkt_ functions, but this isn't
    called by the xmltree parser directly and this way I can add some extra
@@ -333 +346 @@
                 }
         } else if (type) { /* type can only be NULL or "unavailable" in this function */
-                if ((bud->flags & JBFLAG_IS_CHATROOM) && bud->ext_jid) {
+                if ((bud->flags & JBFLAG_IS_CHATROOM) && bud->ext_jid && !jabber_chat_has_other_resources(ic, bud)) {
                         char *reason = NULL;
                         char *status = NULL;