1 files changed, 42 insertions, 19 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index d8c38a40..b07230db 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -614,12 +614,13 @@ do_status (const char *args)
   }
   if ((NULL != cl_head) && ((cl_head != cl_active) || (cl_head != cl_tail)))
   {
-    LOG ("%s", _("Calls waiting:"));
+    
     for (cl = cl_head; NULL != cl; cl = cl->next)
     {
       if (cl == cl_active)
         continue;
-      UPDATE_STATUS (_("#%u: `%s'"), cl->caller_num, cl->caller_id);
+      //UPDATE_STATUS (_("#%u: `%s'"), cl->caller_num, cl->caller_id);
+      LOG ("%s", _("Calls waiting:"));
     }
   }
 }
@@ -790,7 +791,8 @@ do_reject (const char *args)
     /* expected state, do rejection logic */
     GNUNET_assert (NULL != cl_active);
     GNUNET_CONVERSATION_caller_hang_up (cl_active->caller);
-    cl_active = NULL;
+    GNUNET_free (cl_active);
+//    cl_active = NULL;
     phone_state = PS_LISTEN;
     break;
   }
@@ -1321,7 +1323,7 @@ GNUNET_CONVERSATION_GTK_on_hangup_clicked ()
   //FPRINTF (stderr, "hangup clicked \n");
   do_reject (NULL);
   do_status ("");
-  history_add(3,peer_name);
+  //history_add(3,peer_name);
 }
 
 /**
@@ -1548,31 +1550,52 @@ GNUNET_CONVERSATION_GTK_on_add_clicked (GtkButton * button,
 
 void
 GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
-                                           gpointer * user_data)
+                gpointer * user_data)
 {
   FPRINTF (stderr, "remove clicked \n");
   GtkTreeSelection *selection;
   GtkTreeModel     *model;
   GtkTreeIter       iter;
+  GtkDialog        *confirm;  
+  GtkWindow        *main_window;
+  GtkLabel *notification;
+  GtkHBox *content_area;
   
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(contacts_treeview));
   if (gtk_tree_selection_get_selected(selection, &model, &iter))
   {
     gtk_tree_model_get (model, &iter, 0, &name, -1);
-
-  }
-  else
-  {
-    g_print ("no row selected.\n");
-  }
-  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);  
-  del_qe = GNUNET_NAMESTORE_records_store (ns,
-                                          &zone_pkey,
-                                          name,
-                                          0, NULL,
-                                          &del_continuation,
-                                          NULL);
-  gtk_list_store_remove(contacts_liststore, &iter);
+    FPRINTF(stderr, "selected %s \n", name);
+    main_window = get_object ("GNUNET_GTK_conversation_window");
+    confirm =
+        gtk_dialog_new_with_buttons ("Removing contact", main_window,
+                                     GTK_DIALOG_DESTROY_WITH_PARENT,
+                                     _("Yes"), GTK_RESPONSE_ACCEPT,
+                                     _("No"), GTK_RESPONSE_CANCEL, NULL); 
+    content_area = gtk_dialog_get_content_area (GTK_DIALOG (confirm));
+    notification = gtk_label_new ("Do you really want to remove this contact?");
+    gtk_container_add (GTK_CONTAINER (content_area), GTK_WIDGET(notification));
+    gtk_widget_show_all (GTK_WIDGET(confirm));
+    switch (gtk_dialog_run(confirm))
+     {
+     case GTK_RESPONSE_ACCEPT:
+          zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);  
+          del_qe = GNUNET_NAMESTORE_records_store (ns,
+                                                  &zone_pkey,
+                                                  name,
+                                                  0, NULL,
+                                                  &del_continuation,
+                                                  NULL);
+          gtk_list_store_remove(contacts_liststore, &iter);
+          gtk_widget_destroy (GTK_WIDGET(confirm));
+          break;
+     case GTK_RESPONSE_CANCEL:
+          FPRINTF(stderr, "not removing \n");
+          gtk_widget_destroy (GTK_WIDGET(confirm));
+          break;
+     }
+
+   }
 }