- fixed quiting

- added some global functions to contacts header

3 files changed, 18 insertions, 17 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index aa7bba1f..7b6b9fa6 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -1229,7 +1229,7 @@ GNUNET_GTK_conversation_quit_cb (GObject * object, gpointer user_data)
   //  GNUNET_NAMESTORE_disconnect (ns);
   //  ns = NULL;
   //}
-
+  GNUNET_CONVERSATION_GTK_CONTACTS_shutdown();
   GNUNET_SPEAKER_destroy (speaker);
   speaker = NULL;
   GNUNET_MICROPHONE_destroy (mic);
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 6daf8a0f..17fda5e5 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -548,7 +548,7 @@ GNUNET_CONVERSATION_GTK_row_activated ()
 
   address_entry = GTK_ENTRY ( GNUNET_CONVERSATION_GTK_get_main_window_object ("GNUNET_GTK_conversation_address"));
   gtk_entry_set_text (address_entry, callAddress);
-  //do_call (callAddress);
+  do_call (callAddress);
 }
 
 /*
@@ -642,13 +642,15 @@ GNUNET_CONVERSATION_GTK_CONTACTS_init ()
       GTK_TREE_VIEW (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_treeview"));
   contacts_treemodel = GTK_TREE_MODEL (contacts_liststore);
 
-
-  // zone list
+    // zone list
   zone_liststore =
-     GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_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_treemodel = GTK_TREE_MODEL (zone_liststore);
+ zone_treeview =
+      GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
 
   gtk_tree_model_get_iter_first(zone_treemodel, &iterContactsInit);
   gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
@@ -665,7 +667,8 @@ GNUNET_CONVERSATION_GTK_CONTACTS_init ()
 extern void
 GNUNET_CONVERSATION_GTK_CONTACTS_shutdown()
 {
-      GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
+  GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
+  GNUNET_IDENTITY_disconnect(id);
 }
 
 
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.h b/src/conversation/gnunet-conversation-gtk_contacts.h
index d3d9e5ab..0e171c8a 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.h
+++ b/src/conversation/gnunet-conversation-gtk_contacts.h
@@ -34,19 +34,17 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
 extern char *currentlySelectedCallAddress;
 
 /**
- * List of contacts (records).
- */
-extern GtkListStore *contacts_liststore;
+ * function to initialize the contact list
+*/
 
+extern void
+GNUNET_CONVERSATION_GTK_CONTACTS_init ();
 
-/**
- * List of contacts.
- */
-//static GtkTreeStore *contacts_treestore;
+/** 
+ * function to shutdown the contact list
+*/
 
-/**
- * The main tree view for 'gns' that shows the records.
- */
-extern GtkTreeView *contacts_treeview;
+extern void
+GNUNET_CONVERSATION_GTK_CONTACTS_shutdown();