changeset db6bb1b227ec in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=db6bb1b227ec description: don't allow to join a groupchat if we have a contact with the same JID. Fixes #5799

diffstat:

src/dialogs.py | 11 ++++------- src/gui_interface.py | 8 +++++++- 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r f139ada127a3 -r db6bb1b227ec src/dialogs.py --- a/src/dialogs.py Wed Apr 20 22:57:26 2011 +0200 +++ b/src/dialogs.py Thu Apr 21 15:00:32 2011 +0200 @@ -2443,13 +2443,10 @@ _('The group chat Jabber ID has not allowed characters.')) return

- if gajim.interface.msg_win_mgr.has_window(room_jid, self.account): - ctrl = gajim.interface.msg_win_mgr.get_gc_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 gajim.contacts.get_contact(self.account, room_jid): + 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: self.recently_groupchat.remove(room_jid) self.recently_groupchat.insert(0, room_jid) diff -r f139ada127a3 -r db6bb1b227ec src/gui_interface.py --- a/src/gui_interface.py Wed Apr 20 22:57:26 2011 +0200 +++ b/src/gui_interface.py Thu Apr 21 15:00:32 2011 +0200 @@ -1909,6 +1909,12 @@ """ 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: nick = gajim.nicks[account]

@@ -2414,7 +2420,7 @@ if not jid in gajim.gc_connected[account]: # we are not already connected 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) elif jid in self.minimized_controls[account]: # more or less a hack: