From c93815737ffce901c4c35a4def2e3fe0aaaeec99 Mon Sep 17 00:00:00 2001
From: Florent Le Coz <louiz@louiz.org>
Date: Sat, 18 Jun 2011 12:52:58 +0200
Subject: Empty roster on disconnect

---
 src/core.py   | 7 ++-----
 src/roster.py | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core.py b/src/core.py
index 0bebc25f..1351914c 100644
--- a/src/core.py
+++ b/src/core.py
@@ -1393,13 +1393,10 @@ class Core(object):
         for tab in self.tabs:
             if isinstance(tab, tabs.MucTab):
                 muc.leave_groupchat(self.xmpp, tab.get_room().name, tab.get_room().own_nick, msg)
+        roster.empty()
         self.save_config()
         # Ugly fix thanks to gmail servers
-        try:
-            sys.stderr = None
-            self.xmpp.disconnect(reconnect)
-        except:
-            pass
+        self.xmpp.disconnect(reconnect)
 
     def command_quit(self, arg):
         """
diff --git a/src/roster.py b/src/roster.py
index aed5f5a0..afe83c9e 100644
--- a/src/roster.py
+++ b/src/roster.py
@@ -45,6 +45,10 @@ class Roster(object):
         except IOError:
             return
 
+    def empty(self):
+        self._contacts = {}
+        self._roster_groups = []
+
     def add_contact(self, contact, jid):
         """
         Add a contact to the contact list
-- 
cgit v1.2.3