diff options
author | mathieui <mathieui@mathieui.net> | 2014-10-14 15:51:30 +0200 |
---|---|---|
committer | mathieui <mathieui@mathieui.net> | 2014-10-14 15:51:30 +0200 |
commit | 545ad1bd71e87a482b357f5b49a0898be73478d8 (patch) | |
tree | e513febd81f0c3d338b047f0672e5353e92534d4 /src/tabs/muctab.py | |
parent | 37fe4be7ec35278f23c9f5c07607c3a14e6b6753 (diff) | |
parent | 088c6c6a0b46309d17c4b0ba5939a2dd200c7002 (diff) | |
download | poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.gz poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.bz2 poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.xz poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.zip |
Merge branch 'master' of git.poez.io:poezio into slix
Conflicts:
src/core/handlers.py
src/tabs/xmltab.py
Diffstat (limited to 'src/tabs/muctab.py')
-rw-r--r-- | src/tabs/muctab.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tabs/muctab.py b/src/tabs/muctab.py index 5ebaf522..f526ec80 100644 --- a/src/tabs/muctab.py +++ b/src/tabs/muctab.py @@ -355,7 +355,8 @@ class MucTab(ChatTab): dump_tuple(theme.color_role(user.role)), user.role or 'None', '\n%s' % user.status if user.status else '') - self.core.information(info, 'Info') + self.add_message(info, typ=0) + self.core.refresh_window() def command_configure(self, arg): """ @@ -1525,11 +1526,11 @@ class MucTab(ChatTab): config.get_by_tabname('notify_messages', True, self.name)): self.state = 'message' - if time: + if time and not txt.startswith('/me'): txt = '\x19%(info_col)s}%(txt)s' % { 'txt': txt, 'info_col': dump_tuple(get_theme().COLOR_LOG_MSG)} - elif (not nickname or time) and not txt.startswith('/me '): + elif not nickname: txt = '\x19%(info_col)s}%(txt)s' % { 'txt': txt, 'info_col': dump_tuple(get_theme().COLOR_INFORMATION_TEXT)} |