diff options
author | Maxime “pep” Buquet <pep@bouah.net> | 2019-04-08 13:49:57 +0100 |
---|---|---|
committer | Maxime “pep” Buquet <pep@bouah.net> | 2019-04-08 14:01:09 +0100 |
commit | bf2225468e8f496a45db477b596eb7d233cb813f (patch) | |
tree | 86fefa7497fc2d1d9a75442bc993a3b2b50055af /poezio/tabs/conversationtab.py | |
parent | 6ab49c188a6e5bb95773165f0bdbd672b41c8c81 (diff) | |
download | poezio-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/conversationtab.py')
-rw-r--r-- | poezio/tabs/conversationtab.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py index 23529a9b..d1ad608c 100644 --- a/poezio/tabs/conversationtab.py +++ b/poezio/tabs/conversationtab.py @@ -15,8 +15,6 @@ import curses import logging from typing import Dict, Callable -from slixmpp import JID - from poezio.tabs.basetabs import OneToOneTab, Tab from poezio import common @@ -44,7 +42,7 @@ class ConversationTab(OneToOneTab): additional_information = {} # type: Dict[str, Callable[[str], str]] message_type = 'chat' - def __init__(self, core, jid: JID): + def __init__(self, core, jid): OneToOneTab.__init__(self, core, jid) self.nick = None self.nick_sent = False @@ -402,10 +400,10 @@ class DynamicConversationTab(ConversationTab): plugin_commands = {} # type: Dict[str, Command] plugin_keys = {} # type: Dict[str, Callable] - def __init__(self, core, jid: JID, resource=None): + def __init__(self, core, jid, resource=None): self.locked_resource = None + self.name = safeJID(jid).bare ConversationTab.__init__(self, core, jid) - self.name.resource = None self.info_header = windows.DynamicConversationInfoWin() self.register_command( 'unlock', self.unlock_command, shortdesc='Deprecated, do nothing.') @@ -472,8 +470,8 @@ class StaticConversationTab(ConversationTab): plugin_commands = {} # type: Dict[str, Command] plugin_keys = {} # type: Dict[str, Callable] - def __init__(self, core, jid: JID): - assert jid.resource + def __init__(self, core, jid): + assert (safeJID(jid).resource) ConversationTab.__init__(self, core, jid) self.info_header = windows.ConversationInfoWin() self.resize() |