1 files changed, 12 insertions, 3 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 6619363e..808306ff 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -646,8 +646,8 @@ GNUNET_CONVERSATION_GTK_CONTACTS_init ()
   zone_liststore =
      GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore")); 
 
- zone_treestore =
-      GTK_TREE_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_treestore"));
+// zone_treestore =
+//      GTK_TREE_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_treestore"));
   zone_treemodel = GTK_TREE_MODEL (zone_liststore);
  zone_treeview =
       GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
@@ -668,7 +668,16 @@ extern void
 GNUNET_CONVERSATION_GTK_CONTACTS_shutdown()
 {
   GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
-  GNUNET_IDENTITY_disconnect(id);
+  if (NULL != id)
+  {
+    GNUNET_IDENTITY_disconnect (id);
+    id = NULL;
+  }
+  if (NULL != ns)
+  {
+    GNUNET_NAMESTORE_disconnect (ns);
+    ns = NULL;
+  }
 }