1 files changed, 26 insertions, 33 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 808306ff..821d5009 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -135,17 +135,17 @@ static struct GNUNET_IDENTITY_Handle *id;
 /**
  * Handle to the namestore.
  */
-struct GNUNET_NAMESTORE_Handle *ns;
+static struct GNUNET_NAMESTORE_Handle *ns;
 
 /**
  * Private key for the our zone.
  */
-struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
 
 /**
   * Public key of the zone we are currently editing.
   */
-struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
+static struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
 
 
 
@@ -153,7 +153,7 @@ struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
 /**
  * Name of the records to add/list/remove.
  */
-static char *name;
+ static char *name;
 
 /**
  * Queue entry for the 'add' operation.
@@ -181,12 +181,15 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
   struct GNUNET_TIME_Relative rt;
   GtkTreeIter display_iter;
 
+
   if (NULL == rname)
   {
+  
     list_it = NULL;
     //test_finished ();
     return;
   }
+
   for (i = 0; i < rd_len; i++)
   {
 
@@ -240,7 +243,10 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
     GNUNET_free (s);
   }
 //  FPRINTF (stdout, "%s", "\n");
+  
   GNUNET_NAMESTORE_zone_iterator_next (list_it);
+//  GNUNET_NAMESTORE_zone_iteration_stop(list_it);
+
 }
 
 
@@ -277,38 +283,12 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
 
   }
 
- /* 
-  if (NULL == name)
-    return;
-  if (ego == contacts_ego)
-  {
-    //if (verbose)
-      LOG (_("Name of phonebook ego changed to `%s'\n"), name);
-    GNUNET_free (contacts_ego_name);
-    contacts_ego_name = GNUNET_strdup (name);
-    return;
-  }
-  if (0 != strcmp (name, contacts_ego_name))
-    return;
-  if (NULL == ego)
-  {
-    if (verbose)
-      LOG (_("Our phonebook ego `%s' was deleted!\n"), contacts_ego_name);
-    contacts_ego = NULL;
-    return;
-  }
-  */
   contacts_ego = ego;
 
   
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
   ns = GNUNET_NAMESTORE_connect (cfg);
-
-
-//  list_it =
-//      GNUNET_NAMESTORE_zone_iteration_start (ns, &zone_pkey, &display_record,
-//                NULL);
-        
+     
 }
 /**
  * Continuation called to notify client about result of the
@@ -372,7 +352,7 @@ del_continuation (void *cls, int32_t success, const char *emsg)
  * @param name
  * @param address
  */
-void
+static void
 add_contact (const gchar * name, const gchar * address)
 {
 //      memmove(&address+1,&address+51,1);
@@ -667,17 +647,30 @@ GNUNET_CONVERSATION_GTK_CONTACTS_init ()
 extern void
 GNUNET_CONVERSATION_GTK_CONTACTS_shutdown()
 {
-  GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
+
   if (NULL != id)
   {
     GNUNET_IDENTITY_disconnect (id);
     id = NULL;
+  } else {
+      GNUNET_break(0);
+  }
+
+  if (NULL != list_it)
+  {
+  FPRINTF(stderr,"LIST_IT == NULL");
+//  GNUNET_NAMESTORE_zone_iteration_stop(list_it);
   }
   if (NULL != ns)
   {
     GNUNET_NAMESTORE_disconnect (ns);
     ns = NULL;
+  } else {
+     GNUNET_break(0);
   }
+
+  GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
+
 }