pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix a hidden traceback on error message outside MUCs

Browse source
This commit is contained in:
mathieui 2014-05-08 00:27:26 +02:00
parent 51d5520626
commit 9786592b80
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/core/handlers.py
View file

@ -1021,7 +1021,8 @@ def room_error(self, error, room_name):
"""
tab = self.get_tab_by_name(room_name)
error_message = self.get_error_message(error)
tab.add_message(error_message, highlight=True, nickname='Error', nick_color=get_theme().COLOR_ERROR_MSG, typ=2)
tab.add_message(error_message, highlight=True, nickname='Error',
nick_color=get_theme().COLOR_ERROR_MSG, typ=2)
code = error['error']['code']
if code == '401':
msg = _('To provide a password in order to join the room, type "/join / password" (replace "password" by the real password)')

5
src/tabs/basetabs.py
View file

@ -490,10 +490,13 @@ class ChatTab(Tab):
if not logger.log_message(name, nickname, txt, date=time, typ=typ):
self.core.information(_('Unable to write in the log file'), 'Error')
def add_message(self, txt, time=None, nickname=None, forced_user=None, nick_color=None, identifier=None, jid=None, history=None, typ=1):
def add_message(self, txt, time=None, nickname=None, forced_user=None,
nick_color=None, identifier=None, jid=None, history=None,
typ=1, highlight=False):
self.log_message(txt, nickname, time=time, typ=typ)
self._text_buffer.add_message(txt, time=time,
nickname=nickname,
highlight=highlight,
nick_color=nick_color,
history=history,
user=forced_user,