1 files changed, 46 insertions, 36 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_phone.c b/src/conversation/gnunet-conversation-gtk_phone.c
index 59a8a23d..5ac64302 100644
--- a/src/conversation/gnunet-conversation-gtk_phone.c
+++ b/src/conversation/gnunet-conversation-gtk_phone.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010-2013 Christian Grothoff (and other contributing authors)
+     (C) 2010-2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -20,7 +20,7 @@
 
 /**
  * @file src/conversation/gnunet-conversation-gtk_phone.c
- * @brief
+ * @brief main logic to manage phone calls
  * @author yids
  * @author hark
  * @author Christian Grothoff
@@ -253,16 +253,20 @@ static char *peer_name;
  */
 static char *address;
 
-static GtkWidget *b_contact;
+static GtkWidget *b_add_contact;
 
 static GtkWidget *b_accept;
 
-static GtkWidget *b_hangup;
+static GtkWidget *b_refuse;
 
-static GtkWidget *b_suspend;
+static GtkWidget *b_suspend; // pause
 
 static GtkWidget *b_resume;
 
+static GtkWidget *b_call; // connect
+
+static GtkWidget *b_hangup; // disconnect up
+
 
 
 /**
@@ -446,7 +450,7 @@ update_active_call_list_buttons()
     case CT_active:
       // hangup, pause
       //GCG_log("CT_active state: %u ",cl_caller_state);
-      gtk_widget_set_sensitive (b_contact, TRUE);
+      gtk_widget_set_sensitive (b_add_contact, TRUE);
       gtk_widget_set_sensitive (b_accept, FALSE);
       gtk_widget_set_sensitive (b_hangup, TRUE);
       gtk_widget_set_sensitive (b_suspend, TRUE);
@@ -455,7 +459,7 @@ update_active_call_list_buttons()
     case CT_ringing:
       // pickup, phonebook
       //GCG_log("CT_ring show button");
-      gtk_widget_set_sensitive (b_contact, TRUE);
+      gtk_widget_set_sensitive (b_add_contact, TRUE);
       if (phone_state == PS_LISTEN)
       {
         gtk_widget_set_sensitive (b_accept, TRUE);
@@ -471,7 +475,7 @@ update_active_call_list_buttons()
     case CT_rejected:
       //add to phonebook
       //GCG_log("CT_rejected ");
-      gtk_widget_set_sensitive (b_contact, TRUE);
+      gtk_widget_set_sensitive (b_add_contact, TRUE);
       gtk_widget_set_sensitive (b_accept, FALSE);
       gtk_widget_set_sensitive (b_hangup, FALSE);
       gtk_widget_set_sensitive (b_suspend, FALSE);
@@ -480,7 +484,7 @@ update_active_call_list_buttons()
     case CT_suspended:
       // resume, hangup
       //GCG_log("CT_suspended ");
-      gtk_widget_set_sensitive (b_contact, TRUE);
+      gtk_widget_set_sensitive (b_add_contact, TRUE);
       gtk_widget_set_sensitive (b_accept, FALSE);
       gtk_widget_set_sensitive (b_hangup, TRUE);
       gtk_widget_set_sensitive (b_suspend, FALSE);
@@ -498,7 +502,7 @@ update_active_call_list_buttons()
     case CT_other:
       //add to phonebook
       //GCG_log("CT_rejected ");
-      gtk_widget_set_sensitive (b_contact, TRUE);
+      gtk_widget_set_sensitive (b_add_contact, TRUE);
       gtk_widget_set_sensitive (b_accept, TRUE);
       gtk_widget_set_sensitive (b_hangup, TRUE);
       gtk_widget_set_sensitive (b_suspend, TRUE);
@@ -532,7 +536,7 @@ gnunet_conversation_gtk_active_calls_treeview_selection_changed_cb ()
 static void
 disable_list_buttons()
 {
-  gtk_widget_set_sensitive (b_contact, FALSE);
+  gtk_widget_set_sensitive (b_add_contact, FALSE);
   gtk_widget_set_sensitive (b_accept, FALSE);
   gtk_widget_set_sensitive (b_hangup, FALSE);
   gtk_widget_set_sensitive (b_suspend, FALSE);
@@ -977,7 +981,7 @@ call_event_handler (void *cls,
  * @param arg arguments given to the command
  */
 void
-GSC_do_call (const char *arg)
+GSC_PHONE_make_call (const char *arg)
 {
   GtkEntry *address_entry;
   struct GNUNET_IDENTITY_Ego *caller_id;
@@ -1366,12 +1370,11 @@ GNUNET_CONVERSATION_GTK_on_call_clicked ()
 {
   GtkEntry *address_entry;
 
-  address_entry = GTK_ENTRY (GCG_get_main_window_object ("GNUNET_GTK_conversation_address"));
+  address_entry = GTK_ENTRY (GCG_get_main_window_object
+                             ("GNUNET_GTK_conversation_address"));
 
-  GSC_do_call (gtk_entry_get_text(address_entry));
-  //disable_button ("GNUNET_GTK_conversation_accept_button");
+  GSC_PHONE_make_call (gtk_entry_get_text (address_entry));
   do_status ();
-//  free(to_addr);
 }
 
 
@@ -1394,6 +1397,9 @@ gnunet_conversation_gtk_ego_combobox_changed_cb (GtkComboBox *widget,
 }
 
 
+/**
+ * Initialize phone subsystem.
+ */
 void
 GCG_PHONE_init ()
 {
@@ -1403,16 +1409,20 @@ GCG_PHONE_init ()
   speaker = GNUNET_SPEAKER_create_from_hardware (cfg);
   mic = GNUNET_MICROPHONE_create_from_hardware (cfg);
   /* get gui objects */
-  b_contact = GTK_WIDGET (GCG_get_main_window_object
-                          ("GNUNET_GTK_conversation_use_current_button"));
+  b_add_contact = GTK_WIDGET (GCG_get_main_window_object
+                              ("gnunet_conversation_gtk_add_contact_button"));
   b_accept  = GTK_WIDGET (GCG_get_main_window_object
-                          ("GNUNET_GTK_conversation_accept_button"));
-  b_hangup  = GTK_WIDGET (GCG_get_main_window_object
-                          ("GNUNET_GTK_conversation_hangup_button"));
+                          ("gnunet_conversation_gtk_accept_button"));
+  b_refuse  = GTK_WIDGET (GCG_get_main_window_object
+                          ("gnunet_conversation_gtk_hangup_button"));
   b_suspend = GTK_WIDGET (GCG_get_main_window_object
-                          ("GNUNET_GTK_conversation_suspend_button"));
+                          ("gnunet_conversation_gtk_suspend_button"));
   b_resume  = GTK_WIDGET (GCG_get_main_window_object
-                          ("GNUNET_GTK_conversation_resume_button"));
+                          ("gnunet_conversation_gtk_resume_button"));
+  b_call = GTK_WIDGET (GCG_get_main_window_object
+                          ("gnunet_conversation_gtk_call_button"));
+  b_hangup = GTK_WIDGET (GCG_get_main_window_object
+                         ("gnunet_conversation_gtk_hangup_button"));
 
   active_liststore =
      GTK_LIST_STORE (GCG_get_main_window_object
@@ -1423,25 +1433,23 @@ GCG_PHONE_init ()
 }
 
 
+/**
+ * Shutdown phone subsystem.
+ */
 void
 GCG_PHONE_shutdown ()
 {
-//TODO: make this work
-  //struct OperationContext *oc;
+  struct CallList *cl;
 
-/*
-  GCG_advertise_shutdown_ ();
-  while (NULL != (oc = oc_head))
+  while (NULL != (cl = cl_head))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Operation not completed due to shutdown\n"));
-    GNUNET_IDENTITY_cancel (oc->op);
-    GNUNET_CONTAINER_DLL_remove (oc_head,
-                                 oc_tail,
-                                 oc);
-    GNUNET_free (oc);
+    GNUNET_CONVERSATION_caller_hang_up (cl->caller);
+    GNUNET_CONTAINER_DLL_remove (cl_head,
+                                 cl_tail,
+                                 cl);
+    // FIXME: release other memory?
+    GNUNET_free (cl);
   }
-  */
   if (NULL != call)
   {
     GNUNET_CONVERSATION_call_stop (call);
@@ -1460,3 +1468,5 @@ GCG_PHONE_shutdown ()
   peer_name = NULL;
   phone_state = PS_ERROR;
 }
+
+/* end of gnunet-conversation-gtk_phone.c */