summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2013-07-29 19:31:33 +0200
committermathieui <mathieui@mathieui.net>2013-07-29 19:31:33 +0200
commitcbcac03510de5c316bc5e5c0136547911beeacd2 (patch)
tree4170bff96a168af26e668e0f5648781f6cd39e1b /src
parentd64a95bd3bc58f14e3a5684bd198dac7c0f4a7d6 (diff)
downloadpoezio-cbcac03510de5c316bc5e5c0136547911beeacd2.tar.gz
poezio-cbcac03510de5c316bc5e5c0136547911beeacd2.tar.bz2
poezio-cbcac03510de5c316bc5e5c0136547911beeacd2.tar.xz
poezio-cbcac03510de5c316bc5e5c0136547911beeacd2.zip
Fix #2335 (crash on /cycle with room without userpart)
Diffstat (limited to 'src')
-rw-r--r--src/core.py16
-rw-r--r--src/multiuserchat.py3
2 files changed, 9 insertions, 10 deletions
diff --git a/src/core.py b/src/core.py
index d1b0d7e5..009cfaa4 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1811,14 +1811,14 @@ class Core(object):
nick = tab.own_nick
else:
room = info.bare
- if room.find('@') == -1 and not server_root: # no server is provided, like "/join hello"
- # use the server of the current room if available
- # check if the current room's name has a server
- if isinstance(self.current_tab(), tabs.MucTab) and\
- self.current_tab().get_name().find('@') != -1:
- room += '@%s' % safeJID(self.current_tab().get_name()).domain
- else:
- room = args[0]
+ if room.find('@') == -1 and not server_root: # no server is provided, like "/join hello"
+ # use the server of the current room if available
+ # check if the current room's name has a server
+ if isinstance(self.current_tab(), tabs.MucTab) and\
+ self.current_tab().get_name().find('@') != -1:
+ room += '@%s' % safeJID(self.current_tab().get_name()).domain
+ else:
+ room = args[0]
room = room.lower()
if room in self.pending_invites:
del self.pending_invites[room]
diff --git a/src/multiuserchat.py b/src/multiuserchat.py
index 013fd2cb..d69daf42 100644
--- a/src/multiuserchat.py
+++ b/src/multiuserchat.py
@@ -66,8 +66,7 @@ def change_nick(core, jid, nick, status=None, show=None):
def join_groupchat(core, jid, nick, passwd='', maxhistory=None, status=None, show=None, seconds=0):
xmpp = core.xmpp
- jid = safeJID(jid)
- stanza = xmpp.makePresence(pto="%s/%s" % (jid, nick), pstatus=status, pshow=show)
+ stanza = xmpp.makePresence(pto='%s/%s' % (jid, nick), pstatus=status, pshow=show)
x = ET.Element('{http://jabber.org/protocol/muc}x')
if passwd:
passelement = ET.Element('password')