/join command without argument now pre-fill join_groupchat dialog with current server and nickname
This commit is contained in:
parent
575b9c242a
commit
765b5eb2b2
|
@ -1289,6 +1289,8 @@ 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]
|
||||||
|
else:
|
||||||
|
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:
|
if room_jid.find('/') >= 0:
|
||||||
room_jid, nick = room_jid.split('/', 1)
|
room_jid, nick = room_jid.split('/', 1)
|
||||||
|
@ -1310,8 +1312,6 @@ class GroupchatControl(ChatControlBase):
|
||||||
#%s is something the user wrote but it is not a jid so we inform
|
#%s is something the user wrote but it is not a jid so we inform
|
||||||
s = _('%s does not appear to be a valid JID') % message_array[0]
|
s = _('%s does not appear to be a valid JID') % message_array[0]
|
||||||
self.print_conversation(s, 'info')
|
self.print_conversation(s, 'info')
|
||||||
else:
|
|
||||||
self.get_command_help(command)
|
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue