Unverified Commit a157a21c authored by mathieui's avatar mathieui

Always feed a JID to open_conversation_window

parent ea5977da
......@@ -1040,7 +1040,7 @@ class CommandCore:
jid.full, False, fallback_barejid=False)
muc = self.core.tabs.by_name_and_class(jid.bare, tabs.MucTab)
if not tab and not muc:
tab = self.core.open_conversation_window(jid.full, focus=True)
tab = self.core.open_conversation_window(JID(jid.full), focus=True)
elif muc:
if jid.resource:
tab = self.core.tabs.by_name_and_class(jid.full,
......
......@@ -639,13 +639,13 @@ class Core:
"""
if isinstance(roster_row, Contact):
if not self.get_conversation_by_jid(roster_row.bare_jid, False):
self.open_conversation_window(roster_row.bare_jid)
self.open_conversation_window(JID(roster_row.bare_jid))
else:
self.focus_tab_named(roster_row.bare_jid)
if isinstance(roster_row, Resource):
if not self.get_conversation_by_jid(
roster_row.jid, False, fallback_barejid=False):
self.open_conversation_window(roster_row.jid)
self.open_conversation_window(JID(roster_row.jid))
else:
self.focus_tab_named(roster_row.jid)
self.refresh_window()
......@@ -1038,7 +1038,7 @@ class Core:
# nothing was found (and we lock it to the resource
# later)
conversation = self.open_conversation_window(
jid.bare, False)
JID(jid.bare), False)
else:
conversation = None
return conversation
......
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