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

Fix a bug with (systray, drag and drop) and minimized groucpchat

Browse source
This commit is contained in:
Julien Pivotto 2007-06-04 12:18:34 +00:00
parent b6dec549e0
commit 6269150711
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gajim.py
View file

@ -2127,14 +2127,13 @@ class Interface:
jid = gajim.get_jid_without_resource(fjid) jid = gajim.get_jid_without_resource(fjid)
if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'):
w = self.msg_win_mgr.get_window(jid, account) w = self.msg_win_mgr.get_window(jid, account)
if gajim.interface.minimized_controls.has_key(account) and \ if self.minimized_controls.has_key(account) and \
gajim.interface.minimized_controls[account].has_key(fjid): self.minimized_controls[account].has_key(jid):
ctrl = gajim.interface.minimized_controls[account][fjid]
if not w: 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.account, ctrl.type_id)
ctrl.parent_win = w self.roster.on_groupchat_maximized(None, jid, account)
w.new_tab(ctrl)
elif type_ in ('printed_chat', 'chat', ''): elif type_ in ('printed_chat', 'chat', ''):
# '' is for log in/out notifications # '' is for log in/out notifications
if self.msg_win_mgr.has_window(fjid, account): if self.msg_win_mgr.has_window(fjid, account):

3
src/roster_window.py
View file

@ -4681,6 +4681,9 @@ class RosterWindow:
it = model.iter_parent(it) it = model.iter_parent(it)
grp_dest = model[it][C_JID].decode('utf-8') 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 \ if (type_dest == 'account' or not self.regroup) and \
account_source != account_dest: account_source != account_dest:
# add contact to this account in that group # add contact to this account in that group