From 6269150711f2c1f7122aafe1c0798ddadceae025 Mon Sep 17 00:00:00 2001 From: Julien Pivotto Date: Mon, 4 Jun 2007 12:18:34 +0000 Subject: [PATCH] Fix a bug with (systray, drag and drop) and minimized groucpchat --- src/gajim.py | 11 +++++------ src/roster_window.py | 3 +++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gajim.py b/src/gajim.py index 7e9dcd5a2..8d8ef1b4b 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -2127,14 +2127,13 @@ class Interface: jid = gajim.get_jid_without_resource(fjid) if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): w = self.msg_win_mgr.get_window(jid, account) - if gajim.interface.minimized_controls.has_key(account) and \ - gajim.interface.minimized_controls[account].has_key(fjid): - ctrl = gajim.interface.minimized_controls[account][fjid] + if self.minimized_controls.has_key(account) and \ + self.minimized_controls[account].has_key(jid): if not w: - w = gajim.interface.msg_win_mgr.create_window(ctrl.contact, \ + ctrl = self.minimized_controls[account][jid] + w = self.msg_win_mgr.create_window(ctrl.contact, \ ctrl.account, ctrl.type_id) - ctrl.parent_win = w - w.new_tab(ctrl) + self.roster.on_groupchat_maximized(None, jid, account) elif type_ in ('printed_chat', 'chat', ''): # '' is for log in/out notifications if self.msg_win_mgr.has_window(fjid, account): diff --git a/src/roster_window.py b/src/roster_window.py index 4749efa76..70fdd1424 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4681,6 +4681,9 @@ class RosterWindow: it = model.iter_parent(it) grp_dest = model[it][C_JID].decode('utf-8') + if type_dest == 'groupchat' or type_source == 'groupchat': + return + if (type_dest == 'account' or not self.regroup) and \ account_source != account_dest: # add contact to this account in that group