Author: jim++ Date: 2006-07-08 13:51:42 +0200 (Sat, 08 Jul 2006) New Revision: 6541

Modified: trunk/src/roster_window.py Log: 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.

Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2006-07-08 11:01:20 UTC (rev 6540) +++ trunk/src/roster_window.py 2006-07-08 11:51:42 UTC (rev 6541) @@ -332,6 +332,9 @@ gajim.interface.roster.add_contact_to_roster(transport, 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]: return if contact.jid.find('@') < 1 and gajim.connections[account].connected > 1: