summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/core.py2
-rw-r--r--src/tabs.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core.py b/src/core.py
index 766be909..9f36b78a 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1269,7 +1269,7 @@ class Core(object):
"""
/join [room][/nick] [password]
"""
- args = arg.split()
+ args = common.shell_split(arg)
password = None
if len(args) == 0:
t = self.current_tab()
diff --git a/src/tabs.py b/src/tabs.py
index 8ddf60ad..60d91777 100644
--- a/src/tabs.py
+++ b/src/tabs.py
@@ -477,7 +477,7 @@ class MucTab(ChatTab):
muc.leave_groupchat(self.core.xmpp, self.get_name(), self.get_room().own_nick, arg)
self.get_room().disconnect()
self.core.disable_private_tabs(self.get_room().name)
- self.core.command_join('/%s' % self.core.get_bookmark_nickname(self.get_room().name), '0')
+ self.core.command_join('"/%s"' % self.core.get_bookmark_nickname(self.get_room().name), '0')
self.user_win.pos = 0
def command_recolor(self, arg):