From e81c92c549c67f93ab3bb659d0cae0d44200aef5 Mon Sep 17 00:00:00 2001 From: souliane Date: Wed, 25 Mar 2015 09:42:05 +0100 Subject: [PATCH] quick_frontend, primivitus: revert changes made in rev 1386 (1f3513cfb246) concerning ChatText.nick: was mixing MUC occupant nick and roster contact nick/node --- frontends/src/primitivus/chat.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontends/src/primitivus/chat.py b/frontends/src/primitivus/chat.py index bd34aafd..8acbfc34 100644 --- a/frontends/src/primitivus/chat.py +++ b/frontends/src/primitivus/chat.py @@ -37,9 +37,10 @@ from sat_frontends.tools import jid class ChatText(urwid.FlowWidget): """Manage the printing of chat message""" - def __init__(self, parent, timestamp, my_mess, message, align='left', is_info=False): + def __init__(self, parent, timestamp, nick, my_mess, message, align='left', is_info=False): self.parent = parent self.timestamp = time.localtime(timestamp) + self.nick = nick self.my_mess = my_mess self.message = unicode(message) self.align = align @@ -72,7 +73,7 @@ class ChatText(urwid.FlowWidget): if self.parent.show_short_nick: render_txt.append(('my_nick' if self.my_mess else 'other_nick', "**" if self.my_mess else "*")) else: - render_txt.append(('my_nick' if self.my_mess else 'other_nick', "[%s] " % self.parent.nick)) + render_txt.append(('my_nick' if self.my_mess else 'other_nick', "[%s] " % self.nick)) render_txt.append(self.message) txt_widget = urwid.Text(render_txt, align=self.align) if self.is_info: @@ -299,7 +300,7 @@ class Chat(PrimitivusWidget, QuickChat): except TypeError: # None is returned, the message is managed return - new_text = ChatText(self, timestamp, mymess, msg) + new_text = ChatText(self, timestamp, nick, mymess, msg) if timestamp and self.content: for idx in range(len(self.content) - 1, -1, -1): @@ -339,7 +340,7 @@ class Chat(PrimitivusWidget, QuickChat): timestamp = float(extra['timestamp']) except KeyError: timestamp = None - _widget = ChatText(self, timestamp, False, msg, is_info=True) + _widget = ChatText(self, timestamp, None, False, msg, is_info=True) self.content.append(_widget) self._notify(msg=msg)