copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

it's only room_jid now, was missing in [7112], [7142] was not enough

This commit is contained in:
Jean-Marie Traissard 2006-10-08 19:14:01 +00:00
parent b8b7aa8ab1
commit 2315eb8907
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/groupchat_control.py
View File

@ -1070,13 +1070,11 @@ class GroupchatControl(ChatControlBase):
elif command == 'join': elif command == 'join':
# example: /join room@conference.example.com/nick # example: /join room@conference.example.com/nick
if len(message_array): if len(message_array):
message_array = message_array[0] room_jid = message_array[0]
if message_array.find('@') >= 0: if room_jid.find('@') >= 0:
room, servernick = message_array.split('@') if room_jid.find('/') >= 0:
if servernick.find('/') >= 0: room_jid, nick = room_jid.split('/', 1)
server, nick = servernick.split('/', 1)
else: else:
server = servernick
nick = '' nick = ''
#join_gc window is needed in order to provide for password entry. #join_gc window is needed in order to provide for password entry.
if gajim.interface.instances[self.account].has_key('join_gc'): if gajim.interface.instances[self.account].has_key('join_gc'):
@ -1086,7 +1084,7 @@ class GroupchatControl(ChatControlBase):
try: try:
gajim.interface.instances[self.account]['join_gc'] =\ gajim.interface.instances[self.account]['join_gc'] =\
dialogs.JoinGroupchatWindow(self.account, dialogs.JoinGroupchatWindow(self.account,
server = server, room_jid = room, nick = nick) room_jid = room_jid, nick = nick)
except GajimGeneralException: except GajimGeneralException:
pass pass
self.clear(self.msg_textview) self.clear(self.msg_textview)