diff options
| author | Valeriy Malov <jazzvoid@gmail.com> | 2017-10-12 15:23:12 +0300 |
|---|---|---|
| committer | dequis <dx@dxzone.com.ar> | 2017-11-19 21:03:32 -0300 |
| commit | f75aaac5e9c0a0ce6e19c3d167ae41acc02f95b1 (patch) | |
| tree | 02a8e7e4c339901caf1b513ed79e723146e309f1 | |
| parent | 861de54f5a71fc7a1b27434e1618e79617b6e072 (diff) | |
Handle always_use_nicks more gracefully
Add MUC buddies before applying nick changes
| -rw-r--r-- | protocols/jabber/conference.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 = '/'; } |