1 files changed, 34 insertions, 89 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 0d1120fb..094b41b2 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -297,8 +297,8 @@ 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';
+    strncpy (&callerName, &caller_id, 50);
+    callerName[52] = '\0';
     quick_message ("der is een beller", caller_id);
 
     break;
@@ -313,7 +313,7 @@ phone_event_handler (void *cls, enum GNUNET_CONVERSATION_PhoneEventCode code,
       return;
     }
     LOG (_("Call from `%s' terminated\n"), cl->caller_id);
-
+    history_add(3, cl->caller_id);
     GNUNET_CONTAINER_DLL_remove (cl_head, cl_tail, cl);
     GNUNET_free (cl->caller_id);
     if (cl == cl_active)
@@ -543,11 +543,15 @@ do_accept (const char *args)
     LOG (_("There is no incoming call `%s' to accept right now!\n"), args);
     return;
   }
-  cl_active = cl;
-  GNUNET_free_non_null (peer_name);
-  peer_name = GNUNET_strdup (cl->caller_id);
-  phone_state = PS_ACCEPTED;
-  GNUNET_CONVERSATION_caller_pick_up (cl->caller, &caller_event_handler, cl,
+
+    GNUNET_CONTAINER_DLL_remove (cl_head,
+                             cl_tail,
+                             cl);
+    cl_active = cl;
+    GNUNET_free_non_null (peer_name);
+    peer_name = GNUNET_strdup (cl->caller_id);
+    phone_state = PS_ACCEPTED;
+    GNUNET_CONVERSATION_caller_pick_up (cl->caller, &caller_event_handler, cl,
                                       speaker, mic);
 
   history_add (CH_ACCEPTED, peer_name);
@@ -884,8 +888,11 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
       type = "PHONE";
     }
 //    FPRINTF (stdout, "%s", rname);
-    gtk_list_store_append (contacts_liststore, &iter);
-    gtk_list_store_set (contacts_liststore, &iter, 1, type, 0, rname, -1);
+    if (rd[i].record_type == 65536 || rd[i].record_type == 65536)
+    {
+      gtk_list_store_append (contacts_liststore, &iter);
+      gtk_list_store_set (contacts_liststore, &iter, 1, type, 0, rname, -1);
+    }
 
 /*        FPRINTF (stdout,
                      "\t%s: %s (%s)\t%s\t%s\t%s\n",
@@ -1424,9 +1431,6 @@ add_contact (const gchar * name, const gchar * address)
   static size_t data_size;
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
 
-  FPRINTF (stderr, 'address: %s', address);
-  FPRINTF (stderr, 'address-len: %i', strlen (address));
-
   GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey);
   rde = &rd;
   zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
@@ -1464,85 +1468,14 @@ void
 GNUNET_CONVERSATION_GTK_on_add_clicked (GtkButton * button,
                                         gpointer * user_data)
 {
-//  gint response_id;
-
-  //unused:  *anotherArea, *labelName, *labelAddres *caller_name
-
-  GtkLabel *notification;
 
-//  GtkHBox *content_area;
-  GtkContainer *content_area;
-  GtkButton *currentCheckButton;
   GtkEntry *nameEntry, *addressEntry;
-  GtkDialog *dialog;
-  GtkWindow *main_window;
-
-  currentCheckButton =
-      GTK_BUTTON (gtk_button_new_with_label ("use currently incoming addres"));
-
-  nameEntry = gtk_entry_new ();
-  gtk_entry_set_text (nameEntry, "Name");
-  addressEntry = gtk_entry_new ();
-  gtk_entry_set_text (addressEntry, "Address");
-
-  main_window = GTK_WINDOW (get_object ("GNUNET_GTK_conversation_window"));
-
-  dialog =
-      GTK_DIALOG (gtk_dialog_new_with_buttons
-                  ("Adding contact", main_window,
-                   GTK_DIALOG_DESTROY_WITH_PARENT, _("Add contact"),
-                   GTK_RESPONSE_ACCEPT, _("Cancel"), GTK_RESPONSE_CANCEL,
-                   NULL));
-  gtk_dialog_add_action_widget (dialog, GTK_WIDGET (currentCheckButton),
-                                GTK_RESPONSE_OK);
-//  FPRINTF (stderr, "response id : %u", response_id);
-//  g_signal_connect (GTK_BUTTON (currentCheckButton), "clicked",
-//                    G_CALLBACK (use_current_incoming_address), NULL);
-
-
-  gtk_dialog_add_action_widget (dialog, GTK_WIDGET (nameEntry), 2);
-  gtk_dialog_add_action_widget (dialog, GTK_WIDGET (addressEntry), 3);
-
-  content_area =
-      GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
-
-
-  notification = GTK_LABEL (gtk_label_new ("Adding contact"));
-//    caller_name = gtk_label_new (caller_id);
-
-  // Add the labels, and show everything we've added to the dialog
-  gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET (notification));
-//    gtk_container_add (GTK_CONTAINER (content_area), caller_name);
-  gtk_widget_show_all (GTK_WIDGET (dialog));
-
-  switch (gtk_dialog_run (dialog))
-  {
-  case GTK_RESPONSE_ACCEPT:
-    do_status ("");
-    add_contact (gtk_entry_get_text (nameEntry),
-                 gtk_entry_get_text (addressEntry));
-    gtk_widget_destroy (GTK_WIDGET (dialog));
-    break;
-  case GTK_RESPONSE_CANCEL:
-    FPRINTF (stderr, "cancel clicked");
-    do_status ("");
-    FPRINTF (stderr, 'use_current: callername: %s', callerName);
-
-
-    gtk_widget_destroy (GTK_WIDGET (dialog));
-    break;
-  case GTK_RESPONSE_OK:
-    //use_current_incoming_address();
-    gtk_entry_set_text (GTK_ENTRY (addressEntry), callerName);
-    add_contact (gtk_entry_get_text (nameEntry), callerName);
-//              add_contact(gtk_entry_get_text(nameEntry),memmove(&callerName,&callerName+52,1));
-    gtk_widget_destroy (GTK_WIDGET (dialog));
-
-//              memmove(&address+1,&address+51,1);
-    break;
-  }
-
 
+  nameEntry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_nameAdd"));
+  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));
 }
 
 void
@@ -1594,6 +1527,18 @@ GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
   }
 }
 
+void
+GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton * button,
+                                        gpointer * user_data)
+{
+  GtkEntry *addressEntry;
+  FPRINTF(stderr,"on current clicked %s\n",callerName);
+  
+  addressEntry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_addressAdd"));
+  gtk_entry_set_text(addressEntry, callerName);
+    
+}
+
 
 /*
  * row activated