summaryrefslogtreecommitdiff
path: root/poezio/tabs/muctab.py
diff options
context:
space:
mode:
authorMaxime “pep” Buquet <pep@bouah.net>2019-04-08 13:49:57 +0100
committerMaxime “pep” Buquet <pep@bouah.net>2019-04-08 14:01:09 +0100
commitbf2225468e8f496a45db477b596eb7d233cb813f (patch)
tree86fefa7497fc2d1d9a75442bc993a3b2b50055af /poezio/tabs/muctab.py
parent6ab49c188a6e5bb95773165f0bdbd672b41c8c81 (diff)
downloadpoezio-bf2225468e8f496a45db477b596eb7d233cb813f.tar.gz
poezio-bf2225468e8f496a45db477b596eb7d233cb813f.tar.bz2
poezio-bf2225468e8f496a45db477b596eb7d233cb813f.tar.xz
poezio-bf2225468e8f496a45db477b596eb7d233cb813f.zip
Revert work on tabs module to change tab.name to JID.
This reverts commits: d693479d05f1ada999c0e29a9d9e2f021dd59e50 2d0cc092fcd154b2d14be0c5ac0ff338607824a0 89a61b84bdb29d3df8c08436c3484fddba8d2ef1 8194d9afbdec2daa1377e07ebb26bb99406473d0 e256c31875c8b67d85fe30d3e2c14c896066657a a21335ac171a827a613dcce744898e822689c9d3 c96e528a8fd1313f75cb792a8e4826fbcfde1bec 0551867bfdb8dfa7dbd5964a15a1a950510e2c71 6ab49c188a6e5bb95773165f0bdbd672b41c8c81
Diffstat (limited to 'poezio/tabs/muctab.py')
-rw-r--r--poezio/tabs/muctab.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py
index 1a9217b3..17abb369 100644
--- a/poezio/tabs/muctab.py
+++ b/poezio/tabs/muctab.py
@@ -55,7 +55,7 @@ class MucTab(ChatTab):
additional_information = {} # type: Dict[str, Callable[[str], str]]
lagged = False
- def __init__(self, core, jid: JID, nick: str, password: str = None):
+ def __init__(self, core, jid, nick, password=None):
ChatTab.__init__(self, core, jid)
self.joined = False
self._state = 'disconnected'
@@ -63,6 +63,7 @@ class MucTab(ChatTab):
self.own_nick = nick
# self User object
self.own_user = None # type: Optional[User]
+ self.name = jid
self.password = password
# buffered presences
self.presence_buffer = []
@@ -1481,7 +1482,7 @@ class MucTab(ChatTab):
r = None
for user in self.users:
if user.nick == nick:
- r = self.core.open_private_window(str(self.name), user.nick)
+ r = self.core.open_private_window(self.name, user.nick)
if r and len(args) == 2:
msg = args[1]
self.core.tabs.current_tab.command_say(