Changeset bb09b3c for protocols/jabber/conference.c

Timestamp:

2010-06-03T21:13:57Z (14 years ago)

Author:

Sven Moritz Hallberg <pesco@…>

Branches:

master

Children:

1dd3470

Parents:

a6b2f13 (diff), df1ae622 (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 in bitlbee 1.2.7

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 );