From 6006fb82aa8239bdf6b8926099fec73e5b46ef57 Mon Sep 17 00:00:00 2001 From: Jean-Marie Traissard Date: Sat, 8 Jul 2006 11:51:42 +0000 Subject: [PATCH] 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. --- src/roster_window.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/roster_window.py b/src/roster_window.py index c6f18670e..aa53c06ea 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -332,6 +332,9 @@ class RosterWindow: 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: