Commit 900b67c0 authored by louiz’'s avatar louiz’

get_tab_by_name() should specify a tab type whenever possible

For example, a tab can be named, if you do /list  If you then do /join, the error handler
needs to get the correct tab (the MucTab, not the MucListTab previously
This commit fixes the above issue (a traceback), and maybe some others like
parent 06fdc82f
......@@ -1219,7 +1219,7 @@ class Core(object):
def on_user_changed_status_in_private(self, jid, msg):
tab = self.get_tab_by_name(jid)
tab = self.get_tab_by_name(jid, tabs.ChatTab)
if tab: # display the message in private
tab.add_message(msg, typ=2)
......@@ -41,7 +41,7 @@ def on_session_start_features(self, _):
if not iq:
features = iq['disco_info']['features']
rostertab = self.get_tab_by_name('Roster')
rostertab = self.get_tab_by_name('Roster', tabs.RosterInfoTab)
if (config.get('enable_carbons', True) and
'urn:xmpp:carbons:2' in features):
......@@ -984,8 +984,8 @@ def on_receipt(self, message):
if not msg_id:
conversation = self.get_tab_by_name(jid)
conversation = conversation or self.get_tab_by_name(jid.bare)
conversation = self.get_tab_by_name(jid, tabs.ChatTab)
conversation = conversation or self.get_tab_by_name(jid.bare, tabs.ChatTab)
if not conversation:
......@@ -1019,7 +1019,7 @@ def room_error(self, error, room_name):
Display the error in the tab
tab = self.get_tab_by_name(room_name)
tab = self.get_tab_by_name(room_name, tabs.MucTab)
error_message = self.get_error_message(error)
tab.add_message(error_message, highlight=True, nickname='Error',
nick_color=get_theme().COLOR_ERROR_MSG, typ=2)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment