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

* Use self instead of gajjim.interface in gajim.py 

* Improve coding of [8220]
This commit is contained in:
Julien Pivotto 2007-06-04 12:22:51 +00:00
parent 6269150711
commit 85c6c4b63c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gajim.py
View File

@ -687,9 +687,9 @@ class Interface:
groupchat_control = self.msg_win_mgr.get_control(jid, account) groupchat_control = self.msg_win_mgr.get_control(jid, account)
if not groupchat_control and \ if not groupchat_control and \
gajim.interface.minimized_controls.has_key(account) and \ self.minimized_controls.has_key(account) and \
jid in gajim.interface.minimized_controls[account]: jid in self.minimized_controls[account]:
groupchat_control = gajim.interface.minimized_controls[account][jid] groupchat_control = self.minimized_controls[account][jid]
pm = False pm = False
if groupchat_control and groupchat_control.type_id == \ if groupchat_control and groupchat_control.type_id == \
message_control.TYPE_GC: message_control.TYPE_GC:
@ -1086,7 +1086,7 @@ class Interface:
control.chg_contact_status(nick, show, status, array[4], array[5], control.chg_contact_status(nick, show, status, array[4], array[5],
array[6], array[7], array[8], array[9], array[10], array[11]) array[6], array[7], array[8], array[9], array[10], array[11])
if control and not control.parent_win: if control and not control.parent_win:
gajim.interface.roster.draw_contact(room_jid, account) self.roster.draw_contact(room_jid, account)
ctrl = self.msg_win_mgr.get_control(fjid, account) ctrl = self.msg_win_mgr.get_control(fjid, account)
@ -1136,7 +1136,7 @@ class Interface:
contact = gajim.contacts.\ contact = gajim.contacts.\
get_contact_with_highest_priority(account, room_jid) get_contact_with_highest_priority(account, room_jid)
if contact: if contact:
gajim.interface.roster.draw_contact(room_jid, account) self.roster.draw_contact(room_jid, account)
if self.remote_ctrl: if self.remote_ctrl:
self.remote_ctrl.raise_signal('GCMessage', (account, array)) self.remote_ctrl.raise_signal('GCMessage', (account, array))
@ -1157,7 +1157,7 @@ class Interface:
get_contact_with_highest_priority(account, jid) get_contact_with_highest_priority(account, jid)
if contact: if contact:
contact.status = array[1] contact.status = array[1]
gajim.interface.roster.draw_contact(jid, account) self.roster.draw_contact(jid, account)
if not gc_control: if not gc_control:
return return

2
src/roster_window.py
View File

@ -4681,7 +4681,7 @@ 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': if type_dest == 'groupchat':
return return
if (type_dest == 'account' or not self.regroup) and \ if (type_dest == 'account' or not self.regroup) and \