summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-06-30 23:23:29 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-06-30 23:23:29 +0200
commit13f885fb74593b6c50174f9bbb7dd279fc344239 (patch)
treeb03077482f41d4cd305b354270238c6f8c1ebcc7
parent8127f66e4d56534d18b4d47c179aacaba5306601 (diff)
parent5a5736bb3c06b3a1d31c5db46cb41f8d8e491aa1 (diff)
downloadpoezio-13f885fb74593b6c50174f9bbb7dd279fc344239.tar.gz
poezio-13f885fb74593b6c50174f9bbb7dd279fc344239.tar.bz2
poezio-13f885fb74593b6c50174f9bbb7dd279fc344239.tar.xz
poezio-13f885fb74593b6c50174f9bbb7dd279fc344239.zip
merge
-rw-r--r--src/core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core.py b/src/core.py
index c4c0edaa..52b783bb 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1240,6 +1240,7 @@ class Core(object):
else: # no server could be found, print a message and return
self.information(_("You didn't specify a server for the room you want to join"), 'Error')
return
+ room = room.lower()
r = self.get_room_by_name(room)
if len(args) == 2: # a password is provided
password = args[1]
@@ -1248,7 +1249,6 @@ class Core(object):
return
if room.startswith('@'):
room = room[1:]
- room = room.lower()
current_status = self.get_status()
if r and not r.joined:
muc.join_groupchat(self.xmpp, room, nick, password,