copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Yann Leboulanger 2009-07-16 14:53:14 +02:00
parent cc154c2bf2
commit 50cf012b75
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/connection_handlers.py
View File

@ -2383,8 +2383,9 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco,
# print in the window the error
self.dispatch('ERROR_ANSWER', ('', jid_stripped,
errmsg, errcode))
self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio,
keyID, timestamp, None))
if errcode != '409': # conflict # See #5120
self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource,
prio, keyID, timestamp, None))
if ptype == 'unavailable' and jid_stripped in self.sessions:
# automatically terminate sessions that they haven't sent a thread ID