pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge

Browse source
This commit is contained in:
Florent Le Coz 2011-06-30 23:23:29 +02:00
commit 13f885fb74
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core.py
View file

@ -1240,6 +1240,7 @@ class Core(object):
else: # no server could be found, print a message and return 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') self.information(_("You didn't specify a server for the room you want to join"), 'Error')
return return
room = room.lower()
r = self.get_room_by_name(room) r = self.get_room_by_name(room)
if len(args) == 2: # a password is provided if len(args) == 2: # a password is provided
password = args[1] password = args[1]
@ -1248,7 +1249,6 @@ class Core(object):
return return
if room.startswith('@'): if room.startswith('@'):
room = room[1:] room = room[1:]
room = room.lower()
current_status = self.get_status() current_status = self.get_status()
if r and not r.joined: if r and not r.joined:
muc.join_groupchat(self.xmpp, room, nick, password, muc.join_groupchat(self.xmpp, room, nick, password,