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

add a comment

This commit is contained in:
Nikos Kouremenos 2005-09-04 17:47:36 +00:00
parent 02e08ff6ba
commit a29c12a8b6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/connection.py
View File

@ -382,10 +382,7 @@ class Connection:
elif errcode == '409': # nick conflict elif errcode == '409': # nick conflict
self.dispatch('ERROR', (_('Unable to join room'), self.dispatch('ERROR', (_('Unable to join room'),
_('Your desired nickname is in use or registered by another user.'))) _('Your desired nickname is in use or registered by another user.')))
else: else: # print in Groupchat window the error
#FIXME: wtf is ERROR_ANSWER? maybe I should handle there?
#some comments in the code ARE VITAL ppl :( :( :(
#other ppl read your code. do not make their life miserable
self.dispatch('ERROR_ANSWER', ('', prs.getFrom().getStripped(), self.dispatch('ERROR_ANSWER', ('', prs.getFrom().getStripped(),
errmsg, errcode)) errmsg, errcode))
if not ptype or ptype == 'unavailable': if not ptype or ptype == 'unavailable':

3
src/gajim.py
View File

@ -159,6 +159,7 @@ class Interface:
gajim.connections[account].build_http_auth_answer(data[2], answer) gajim.connections[account].build_http_auth_answer(data[2], answer)
def handle_event_error_answer(self, account, array): def handle_event_error_answer(self, account, array):
#('ERROR_ANSWER', account, (id, jid_from. errmsg, errcode))
id, jid_from, errmsg, errcode = array id, jid_from, errmsg, errcode = array
if unicode(errcode) in ['403', '406'] and id: if unicode(errcode) in ['403', '406'] and id:
# show the error dialog # show the error dialog
@ -185,7 +186,7 @@ class Interface:
(jid_from, file_props)) (jid_from, file_props))
conn.disconnect_transfer(file_props) conn.disconnect_transfer(file_props)
return return
#('ERROR_ANSWER', account, (id, jid_from. errmsg, errcode))
if jid_from in self.windows[account]['gc']: if jid_from in self.windows[account]['gc']:
self.windows[account]['gc'][jid_from].print_conversation( self.windows[account]['gc'][jid_from].print_conversation(
_('Error %s: %s') % (array[2], array[1]), jid_from) _('Error %s: %s') % (array[2], array[1]), jid_from)