From bf2225468e8f496a45db477b596eb7d233cb813f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Mon, 8 Apr 2019 13:49:57 +0100 Subject: Revert work on tabs module to change tab.name to JID. This reverts commits: d693479d05f1ada999c0e29a9d9e2f021dd59e50 2d0cc092fcd154b2d14be0c5ac0ff338607824a0 89a61b84bdb29d3df8c08436c3484fddba8d2ef1 8194d9afbdec2daa1377e07ebb26bb99406473d0 e256c31875c8b67d85fe30d3e2c14c896066657a a21335ac171a827a613dcce744898e822689c9d3 c96e528a8fd1313f75cb792a8e4826fbcfde1bec 0551867bfdb8dfa7dbd5964a15a1a950510e2c71 6ab49c188a6e5bb95773165f0bdbd672b41c8c81 --- poezio/windows/info_wins.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'poezio/windows') diff --git a/poezio/windows/info_wins.py b/poezio/windows/info_wins.py index f3237a08..3a8d1863 100644 --- a/poezio/windows/info_wins.py +++ b/poezio/windows/info_wins.py @@ -6,7 +6,6 @@ info buffer in normal tabs import logging log = logging.getLogger(__name__) -from slixmpp import JID from poezio.common import safeJID from poezio.config import config @@ -92,7 +91,8 @@ class PrivateInfoWin(InfoWin): self.addstr(plugin(jid), to_curses_attr(get_theme().COLOR_INFORMATION_BAR)) - def write_room_name(self, jid: JID): + def write_room_name(self, name): + jid = safeJID(name) room_name, nick = jid.bare, jid.resource theme = get_theme() self.addstr(nick, to_curses_attr(theme.COLOR_PRIVATE_NAME)) @@ -266,7 +266,7 @@ class MucInfoWin(InfoWin): def refresh(self, room, window=None, user=None, information=None): log.debug('Refresh: %s', self.__class__.__name__) self._win.erase() - self.write_room_name(str(room.name)) + self.write_room_name(room) self.write_participants_number(room) self.write_own_nick(room) self.write_disconnected(room) @@ -287,11 +287,11 @@ class MucInfoWin(InfoWin): for plugin in information.values(): self.addstr(plugin(jid), color) - def write_room_name(self, name: str): + def write_room_name(self, room): theme = get_theme() color = to_curses_attr(theme.COLOR_INFORMATION_BAR) self.addstr('[', color) - self.addstr(name, + self.addstr(room.name, to_curses_attr(theme.COLOR_GROUPCHAT_NAME)) self.addstr(']', color) -- cgit v1.2.3