Ignore:
Timestamp:
2010-05-13T22:05:13Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
704dd38
Parents:
58f5ef7 (diff), 3742fb6 (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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/conference.c

    r58f5ef7 r3429b58  
    274274                }
    275275               
    276                 if( bud != jc->me )
    277                 {
     276                if( bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS )
     277                {
     278                        /* If JIDs are anonymized, add them to the local
     279                           list for the duration of this chat. */
    278280                        imcb_add_buddy( ic, bud->ext_jid, NULL );
    279281                        imcb_buddy_nick_hint( ic, bud->ext_jid, bud->resource );
Note: See TracChangeset for help on using the changeset viewer.