Changeset 537d9b9 for protocols/jabber/conference.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

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

protocols/jabber/conference.c

@@ -28 +28 @@
 static xt_status jabber_chat_self_message(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
-struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password)
+struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password,
+                                   gboolean always_use_nicks)
 {
         struct jabber_chat *jc;
@@ -57 +58 @@
                 g_free(jc);
                 return NULL;
+        }
+
+        if (always_use_nicks) {
+                jc->flags = JCFLAG_ALWAYS_USE_NICKS;
         }
 
@@ -95 +100 @@
         g_free(cserv);
 
-        c = jabber_chat_join(ic, rjid, jd->username, NULL);
+        c = jabber_chat_join(ic, rjid, jd->username, NULL, FALSE);
         g_free(rjid);
         if (c == NULL) {
@@ -244 +249 @@
 }
 
+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
@@ -328 +346 @@
                         *s = 0; /* Should NEVER be NULL, but who knows... */
                 }
+
+                if (bud != jc->me && (jc->flags & JCFLAG_ALWAYS_USE_NICKS) && !(bud->flags & JBFLAG_IS_ANONYMOUS)) {
+                        imcb_buddy_nick_change(ic, bud->ext_jid, bud->resource);
+                }
+
                 imcb_chat_add_buddy(chat, bud->ext_jid);
                 if (s) {
@@ -333 +356 @@
                 }
         } 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;
@@ -443 +466 @@
 
         if (subject && chat) {
-                char *subject_text = subject->text_len > 0 ? subject->text : "";
+                char empty[1] = "";
+                char *subject_text = subject->text_len > 0 ? subject->text : empty;
                 if (g_strcmp0(chat->topic, subject_text) != 0) {
                         bare_jid = (bud) ? jabber_get_bare_jid(bud->ext_jid) : NULL;
@@ -479 +503 @@
                 bare_jid = jabber_get_bare_jid(bud->ext_jid ? bud->ext_jid : bud->full_jid);
                 final_from = bare_jid;
-                flags = (bud == jc->me) ? OPT_SELFMESSAGE : 0;
+                if (bud == jc->me || (g_strcasecmp(final_from, ic->acc->user) == 0)) {
+                        flags = OPT_SELFMESSAGE;
+                }
         } else {
                 final_from = nick;