Changeset ec86b22 for protocols/jabber

Timestamp:

2010-05-15T23:28:16Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2309152

Parents:

ca0981a (diff), 6e6b3d7 (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:

Mainline merge. (Probably mostly irrelevant for this branch, oh well.)

File:

• protocols/jabber/conference.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -272 +272 @@
                 }
                 
-                if( bud != jc->me )
-                {
+                if( bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS )
+                {
+                        /* If JIDs are anonymized, add them to the local
+                           list for the duration of this chat. */
                         imcb_add_buddy( ic, bud->ext_jid, NULL );
                         imcb_buddy_nick_hint( ic, bud->ext_jid, bud->resource );