From f75aaac5e9c0a0ce6e19c3d167ae41acc02f95b1 Mon Sep 17 00:00:00 2001 From: Valeriy Malov Date: Thu, 12 Oct 2017 15:23:12 +0300 Subject: Handle always_use_nicks more gracefully Add MUC buddies before applying nick changes --- protocols/jabber/conference.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'protocols') diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c index 75f3100c..b3d3f95e 100644 --- a/protocols/jabber/conference.c +++ b/protocols/jabber/conference.c @@ -350,11 +350,12 @@ void jabber_chat_pkt_presence(struct im_connection *ic, struct jabber_buddy *bud *s = 0; /* Should NEVER be NULL, but who knows... */ } + imcb_chat_add_buddy(chat, bud->ext_jid); + 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) { *s = '/'; } -- cgit v1.2.3