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

[Maxime Chéramy] /join room works. Gajim uses actual's MUC server.

This commit is contained in:
Yann Leboulanger 2007-09-09 17:35:21 +00:00
parent 7827e3cb9a
commit 0020c95c02
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/groupchat_control.py
View File

@ -1290,29 +1290,26 @@ class GroupchatControl(ChatControlBase):
# example: /join room@conference.example.com/nick # example: /join room@conference.example.com/nick
if len(message_array): if len(message_array):
room_jid = message_array[0] room_jid = message_array[0]
if room_jid.find('@') < 0:
room_jid = room_jid + '@' + gajim.get_server_from_jid(self.room_jid)
else: else:
room_jid = '@' + gajim.get_server_from_jid(self.room_jid) room_jid = '@' + gajim.get_server_from_jid(self.room_jid)
if room_jid.find('@') >= 0: if room_jid.find('/') >= 0:
if room_jid.find('/') >= 0: room_jid, nick = room_jid.split('/', 1)
room_jid, nick = room_jid.split('/', 1)
else:
nick = ''
# join_gc window is needed in order to provide for password entry.
if gajim.interface.instances[self.account].has_key('join_gc'):
gajim.interface.instances[self.account]['join_gc'].\
window.present()
else:
try:
gajim.interface.instances[self.account]['join_gc'] =\
dialogs.JoinGroupchatWindow(self.account,
room_jid = room_jid, nick = nick)
except GajimGeneralException:
pass
self.clear(self.msg_textview)
else: else:
#%s is something the user wrote but it is not a jid so we inform nick = ''
s = _('%s does not appear to be a valid JID') % message_array[0] # join_gc window is needed in order to provide for password entry.
self.print_conversation(s, 'info') if gajim.interface.instances[self.account].has_key('join_gc'):
gajim.interface.instances[self.account]['join_gc'].\
window.present()
else:
try:
gajim.interface.instances[self.account]['join_gc'] =\
dialogs.JoinGroupchatWindow(self.account,
room_jid = room_jid, nick = nick)
except GajimGeneralException:
pass
self.clear(self.msg_textview)
return True return True
elif command == 'leave' or command == 'part' or command == 'close': elif command == 'leave' or command == 'part' or command == 'close':
# Leave the room and close the tab or window # Leave the room and close the tab or window