Do not TB when calling really_remove_contact on a deleted account due to the timeout call (simpler than

deleting timeout(s) itself). Fixes #2146.
This commit is contained in:
Jean-Marie Traissard 2006-07-08 11:51:42 +00:00
parent 8660b503a9
commit 6006fb82aa
1 changed files with 3 additions and 0 deletions

View File

@ -332,6 +332,9 @@ class RosterWindow:
gajim.interface.roster.add_contact_to_roster(transport, account) gajim.interface.roster.add_contact_to_roster(transport, account)
def really_remove_contact(self, contact, account): def really_remove_contact(self, contact, account):
if not gajim.interface.instances.has_key(account):
# Account has been deleted during the timeout that called us
return
if contact.jid in gajim.newly_added[account]: if contact.jid in gajim.newly_added[account]:
return return
if contact.jid.find('@') < 1 and gajim.connections[account].connected > 1: if contact.jid.find('@') < 1 and gajim.connections[account].connected > 1: