diff options
| author | Jean-Marie Traissard <jim@lapin.org> | 2006-10-08 23:14:01 +0400 |
|---|---|---|
| committer | Jean-Marie Traissard <jim@lapin.org> | 2006-10-08 23:14:01 +0400 |
| commit | 2315eb8907ae43f981ffcbdf4018c91935e5cb06 (patch) | |
| tree | 73d227dbce2db77ac550699e4b23afffcbf5e369 /src | |
| parent | b8b7aa8ab1cfc162e0832de2ecce56d8763bcdc8 (diff) | |
it's only room_jid now, was missing in [7112], [7142] was not enough
Diffstat (limited to 'src')
| -rw-r--r-- | src/groupchat_control.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/groupchat_control.py b/src/groupchat_control.py index dbf0ffa43..91e60c92c 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1070,13 +1070,11 @@ class GroupchatControl(ChatControlBase): elif command == 'join': # example: /join room@conference.example.com/nick if len(message_array): - message_array = message_array[0] - if message_array.find('@') >= 0: - room, servernick = message_array.split('@') - if servernick.find('/') >= 0: - server, nick = servernick.split('/', 1) + room_jid = message_array[0] + if room_jid.find('@') >= 0: + if room_jid.find('/') >= 0: + room_jid, nick = room_jid.split('/', 1) else: - server = servernick nick = '' #join_gc window is needed in order to provide for password entry. if gajim.interface.instances[self.account].has_key('join_gc'): @@ -1086,7 +1084,7 @@ class GroupchatControl(ChatControlBase): try: gajim.interface.instances[self.account]['join_gc'] =\ dialogs.JoinGroupchatWindow(self.account, - server = server, room_jid = room, nick = nick) + room_jid = room_jid, nick = nick) except GajimGeneralException: pass self.clear(self.msg_textview) |