Fix a bug with (systray, drag and drop) and minimized groucpchat
This commit is contained in:
parent
b6dec549e0
commit
6269150711
11
src/gajim.py
11
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):
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue