1 files changed, 19 insertions, 16 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 4dbc8ba0..9a2dd5a7 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -297,8 +297,9 @@ phone_event_handler (void *cls, enum GNUNET_CONVERSATION_PhoneEventCode code,
     cl->caller_id = GNUNET_strdup (caller_id);
     cl->caller_num = caller_num_gen++;
     GNUNET_CONTAINER_DLL_insert (cl_head, cl_tail, cl);
-    strncpy (&callerName, &caller_id, 50);
-    callerName[52] = '\0';
+    callerName = caller_id;
+    //strncpy (&callerName, &caller_id, 50);
+    //callerName[52] = '\0';
     quick_message ("der is een beller", caller_id);
 
     break;
@@ -485,7 +486,7 @@ do_call (const char *arg)
                                       &call_event_handler, NULL);
   UPDATE_STATUS (_("We are calling `%s', his phone should be ringing."),
                  peer_name);
-  history_add (CH_ACCEPTED, peer_name);
+  history_add (CH_OUTGOING, peer_name);
 }
 
 
@@ -849,14 +850,6 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
     //test_finished ();
     return;
   }
-  if ((NULL != name) && (0 != strcmp (name, rname)))
-  {
-    GNUNET_NAMESTORE_zone_iterator_next (list_it);
-    return;
-  }
-  //FPRINTF (stdout,
-//         "%s:\n",
-//         rname);
   for (i = 0; i < rd_len; i++)
   {
 
@@ -983,7 +976,7 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
 {
   struct GNUNET_CRYPTO_EcdsaPublicKey pk;
   char *s;
-//  GtkTreeIter iter;
+  GtkTreeIter iter;
   
   if (NULL != ego) 
   { 
@@ -1453,10 +1446,9 @@ add_contact (const gchar * name, const gchar * address)
   static size_t data_size;
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
 
-
   GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey);
   rde = &rd;
-  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
+  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (currentAddressBookEgo);
   rd.data = &pkey;
   rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
@@ -1480,7 +1472,6 @@ add_contact (const gchar * name, const gchar * address)
     gtk_list_store_set (contacts_liststore, &iter, 1, "PKEY", 0, name, -1);
   }
 }
-
 /*
  * executed when clicked on add contact
  * @param button
@@ -1498,6 +1489,7 @@ GNUNET_CONVERSATION_GTK_on_add_clicked (GtkButton * button,
   addressEntry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_addressAdd"));
   FPRINTF(stderr,"name %s \n", gtk_entry_get_text (nameEntry));
   FPRINTF(stderr,"addr %s \n", gtk_entry_get_text (addressEntry));
+
   add_contact (gtk_entry_get_text (nameEntry),gtk_entry_get_text(addressEntry));
 }
 
@@ -1700,6 +1692,13 @@ GNUNET_contact_test ()
 //  GNUNET_NAMESTORE_zone_iterator_next(list_it);
 } 
 
+
+GNUNET_IDENTITY_EgoCallback 
+setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego)
+{
+  currentAddressBookEgo = ego;
+}
+
 /**
  * A different zone was selected in the zone toggle bar.  Load the
  * appropriate zone.
@@ -1728,6 +1727,11 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   temp_zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (tempEgo);
   gtk_list_store_clear(contacts_liststore);
 
+  GNUNET_IDENTITY_ego_lookup (cfg,
+                              tempName,
+                              setCurrentAddressbookEgo,
+                              NULL); 
+          
   list_it =
     GNUNET_NAMESTORE_zone_iteration_start (ns, &temp_zone_pkey, &display_record,
                                            NULL);
@@ -1736,4 +1740,3 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
 
 }
 
-