- fixed importing address from incomming call

- fixed adding contacts

2 files changed, 25 insertions, 7 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 1fe4076c..d5af1bea 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -1308,7 +1308,7 @@ GNUNET_GTK_conversation_quit_cb (GObject * object, gpointer user_data)
 static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  //GtkTreeIter iter;
+  GtkTreeIter iterContactsInit;
   GtkWindow *main_window;
 
   //line = 0;
@@ -1400,6 +1400,9 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
 
+  gtk_tree_model_get_iter_first(zone_treemodel, &iterContactsInit);
+  gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
+  gtk_combo_box_set_active_iter(GTK_WIDGET (get_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
 
 }
@@ -1624,10 +1627,22 @@ add_contact (const gchar * name, const gchar * address)
   static void *data;
   static size_t data_size;
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+  
+  struct GNUNET_IDENTITY_Ego *tempEgo;
+  char *tempName;
+  GtkTreeIter testIter;
+  gtk_combo_box_get_active_iter(GTK_WIDGET (get_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &testIter);
 
+  gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
+                      &testIter,
+                      0, &tempName,
+                      1, &tempEgo,
+                      -1);
+  
+  
   GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey);
   rde = &rd;
-  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (currentAddressBookEgo);
+  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (tempEgo);
   rd.data = &pkey;
   rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
   rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
@@ -1726,10 +1741,11 @@ GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton * button,
                                         gpointer * user_data)
 {
   GtkEntry *addressEntry;
-  FPRINTF(stderr,"on current clicked %s\n",callerName);
-  
+//  FPRINTF(stderr,"on current clicked %s\n",callerName);
+  char *strippedAddress; 
   addressEntry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_addressAdd"));
-  gtk_entry_set_text(addressEntry, callerName);
+  currentlySelectedCallAddress[52] = '\0';
+  gtk_entry_set_text(addressEntry, currentlySelectedCallAddress);
     
 }
 
@@ -1921,7 +1937,9 @@ print_call_info()
       if (caller_selected == cl_caller)
       {
        // LOG (_("info for active call:%s number: %u row: %u"), str_data,int_data,row_count);
-        //break ;
+        currentlySelectedCallAddress = str_data;
+        FPRINTF(stderr,"cal addr: %s\n",currentlySelectedCallAddress);
+        break ;
       }
     g_free (str_data);
     row_count++;
diff --git a/src/conversation/gnunet-conversation-gtk.h b/src/conversation/gnunet-conversation-gtk.h
index d40f960f..ff3acde1 100644
--- a/src/conversation/gnunet-conversation-gtk.h
+++ b/src/conversation/gnunet-conversation-gtk.h
@@ -555,6 +555,6 @@ struct GNUNET_GTK_NAMESTORE_PluginEnvironment
 
 static struct GNUNET_IDENTITY_Ego *currentAddressBookEgo;
 
-
+char *currentlySelectedCallAddress;
 
 #endif