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

better message for nick conflict

Browse source
This commit is contained in:
Nikos Kouremenos 2005-08-25 10:06:33 +00:00
parent fd7936ff36
commit 61f1c8c5d4
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/connection.py
View file

@ -343,7 +343,7 @@ class Connection:
jid = prs.getFrom() jid = prs.getFrom()
self.dispatch('SUBSCRIBED', (jid.getStripped().encode('utf8'), self.dispatch('SUBSCRIBED', (jid.getStripped().encode('utf8'),
jid.getResource().encode('utf8'))) jid.getResource().encode('utf8')))
#BE CAREFUL: no con.updateRosterItem() in a callback # BE CAREFUL: no con.updateRosterItem() in a callback
gajim.log.debug(_('we are now subscribed to %s') % who) gajim.log.debug(_('we are now subscribed to %s') % who)
elif ptype == 'unsubscribe': elif ptype == 'unsubscribe':
gajim.log.debug(_('unsubscribe request from %s') % who) gajim.log.debug(_('unsubscribe request from %s') % who)
@ -353,8 +353,9 @@ class Connection:
elif ptype == 'error': elif ptype == 'error':
errmsg = prs.getError() errmsg = prs.getError()
errcode = prs.getErrorCode() errcode = prs.getErrorCode()
if errcode == '409': #conflict: Nick Conflict if errcode == '409': #conflict: Nick Conflict
self.dispatch('ERROR', (errmsg, '')) self.dispatch('ERROR', _('Unable to join room'),
_('Server response:') + '\n' + errmsg)
elif errcode == '502': # Internal Timeout: elif errcode == '502': # Internal Timeout:
self.dispatch('NOTIFY', (prs.getFrom().getStripped().encode('utf8'), self.dispatch('NOTIFY', (prs.getFrom().getStripped().encode('utf8'),
'error', errmsg, prs.getFrom().getResource().encode('utf8'), 'error', errmsg, prs.getFrom().getResource().encode('utf8'),