changeset a1acdd00e6b6 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=a1acdd00e6b6 description: don't remove occupant from room roster when we try to change our nick to the occupant's nick. Fixes #5120

diffstat:

src/common/connection_handlers.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (15 lines):

diff -r c7c431ea5ad5 -r a1acdd00e6b6 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 14 16:41:25 2009 +0200 +++ b/src/common/connection_handlers.py Thu Jul 16 14:53:14 2009 +0200 @@ -2233,8 +2233,9 @@ # 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