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

don't allow to join a groupchat if we have a contact with the same JID. Fixes #5799

This commit is contained in:
Yann Leboulanger 2011-04-21 15:00:32 +02:00
parent a5fc3b7742
commit 82f77772a3
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dialogs.py
View File

@ -2443,13 +2443,10 @@ 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): if gajim.contacts.get_contact(self.account, room_jid):
ctrl = gajim.interface.msg_win_mgr.get_gc_control(room_jid, ErrorDialog(_('This is not a group chat'),
self.account) _('%s is not the name of a group chat.') % room_jid)
if ctrl.type_id != message_control.TYPE_GC: return
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)

8
src/gui_interface.py
View File

@ -1909,6 +1909,12 @@ class Interface:
""" """
Join the room immediately Join the room immediately
""" """
if gajim.contacts.get_contact(account, room_jid):
dialogs.ErrorDialog(_('This is not a group chat'),
_('%s is not the name of a group chat.') % room_jid)
return
if not nick: if not nick:
nick = gajim.nicks[account] nick = gajim.nicks[account]
@ -2414,7 +2420,7 @@ class Interface:
if not jid in gajim.gc_connected[account]: if not jid in gajim.gc_connected[account]:
# we are not already connected # we are not already connected
minimize = bm['minimize'] in ('1', 'true') minimize = bm['minimize'] in ('1', 'true')
gajim.interface.join_gc_room(account, jid, bm['nick'], self.join_gc_room(account, jid, bm['nick'],
bm['password'], minimize = minimize) bm['password'], minimize = minimize)
elif jid in self.minimized_controls[account]: elif jid in self.minimized_controls[account]:
# more or less a hack: # more or less a hack: