Commit 77819da9 authored by Yann Leboulanger's avatar Yann Leboulanger

don't remove occupant from room roster when we try to change our nick to the...

don't remove occupant from room roster when we try to change our nick to the occupant's nick. Fixes #5120
parent bf77021d
...@@ -2233,8 +2233,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ...@@ -2233,8 +2233,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
# print in the window the error # print in the window the error
self.dispatch('ERROR_ANSWER', ('', jid_stripped, self.dispatch('ERROR_ANSWER', ('', jid_stripped,
errmsg, errcode)) errmsg, errcode))
self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, if errcode != '409': # conflict # See #5120
keyID, timestamp, None)) self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource,
prio, keyID, timestamp, None))
if ptype == 'unavailable' and jid_stripped in self.sessions: if ptype == 'unavailable' and jid_stripped in self.sessions:
# automatically terminate sessions that they haven't sent a thread ID # automatically terminate sessions that they haven't sent a thread ID
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment