diff options
author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-05-16 00:28:16 +0100 |
---|---|---|
committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-05-16 00:28:16 +0100 |
commit | ec86b2232da72f7b0c1c0a217d94b6e15698c795 (patch) | |
tree | 008111e5ae7d47ba5547be974769bd0751ee9fd0 /protocols/jabber/conference.c | |
parent | ca0981ad1e427644a33fc31fe78d63ea834f0fa0 (diff) | |
parent | 6e6b3d7c7300c5cf5cf7f1538154925fd2fe3953 (diff) |
Mainline merge. (Probably mostly irrelevant for this branch, oh well.)
Diffstat (limited to 'protocols/jabber/conference.c')
-rw-r--r-- | protocols/jabber/conference.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c index f434c58a..affe8aef 100644 --- a/protocols/jabber/conference.c +++ b/protocols/jabber/conference.c @@ -271,8 +271,10 @@ void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bu bud->flags |= JBFLAG_IS_ANONYMOUS; } - 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 ); } |