do not allow to join a room with the jid of an opened chat window. fixes #2558
This commit is contained in:
parent
7ad0a850d6
commit
15fc024d7c
|
@ -25,6 +25,7 @@ import os
|
||||||
import gtkgui_helpers
|
import gtkgui_helpers
|
||||||
import vcard
|
import vcard
|
||||||
import conversation_textview
|
import conversation_textview
|
||||||
|
import message_control
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import gtkspell
|
import gtkspell
|
||||||
|
@ -1203,6 +1204,12 @@ class JoinGroupchatWindow:
|
||||||
_('The group chat Jabber ID has not allowed characters.'))
|
_('The group chat Jabber ID has not allowed characters.'))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if gajim.interface.msg_win_mgr.has_window(room_jid, self.account):
|
||||||
|
ctrl = gajim.interface.msg_win_mgr.get_control(room_jid, self.account)
|
||||||
|
if ctrl.type_id != message_control.TYPE_GC:
|
||||||
|
ErrorDialog(_('This is not a group chat'),
|
||||||
|
_('%s is not the name of a group chat.') % room_jid)
|
||||||
|
return
|
||||||
if room_jid in self.recently_groupchat:
|
if room_jid in self.recently_groupchat:
|
||||||
self.recently_groupchat.remove(room_jid)
|
self.recently_groupchat.remove(room_jid)
|
||||||
self.recently_groupchat.insert(0, room_jid)
|
self.recently_groupchat.insert(0, room_jid)
|
||||||
|
|
Loading…
Reference in New Issue