1 files changed, 145 insertions, 107 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_phone.c b/src/conversation/gnunet-conversation-gtk_phone.c
index 95275615..22f2e2af 100644
--- a/src/conversation/gnunet-conversation-gtk_phone.c
+++ b/src/conversation/gnunet-conversation-gtk_phone.c
@@ -38,45 +38,50 @@
 enum ActiveCallsTreeViewColumns
 {
   /**
-   * A `gchar *`
+   * A `gchar *` giving the name of the remote user.
    */
-  GCG_PHONE_LS_CALLER_ID,
+  GCG_PHONE_LS_REMOTE_USER_NAME,
 
   /**
-   * A `struct IncomingCall *`
+   * A `struct IncomingCall *` for incoming calls, otherwise NULL.
    */
-  GCG_PHONE_LS_CALLER,
+  GCG_PHONE_LS_INCOMING_CALL,
 
   /**
-   * A `gint`.
+   * A `gint` uniquely identifying the call to the user.
    */
-  GCG_PHONE_LS_CALLER_NUM,
+  GCG_PHONE_LS_NUMBER,
 
   /**
-   * A `gint` for a `enum TypeOfConversation` (FIXME: remove?)
+   * A `gint` for a `enum TypeOfConversation`.
    */
   GCG_PHONE_LS_TYPE,
 
   /**
-   * A `gint` for a `enum InCallState` (FIXME: replace with char *!)
+   * A `gint` for a `enum InCallState`.
    */
-  GCG_PHONE_LS_CALLER_STATE,
+  GCG_PHONE_LS_IN_CALL_STATE,
 
   /**
-   * A `struct OutgoingCall *`.
+   * A `struct OutgoingCall *` for outgoing calls, otherwise NULL.
    */
-  GCG_PHONE_LS_CALL,
+  GCG_PHONE_LS_OUTGOING_CALL,
 
   /**
-   * A `gint` for a `enum OutCallState` (FIXME: replace with char *,
-   * combine with #GCG_PHONE_LS_CALLER_STATE).
+   * A `gint` for a `enum OutCallState`.
    */
-  GCG_PHONE_LS_CALL_STATE,
+  GCG_PHONE_LS_OUT_CALL_STATE,
 
   /**
-   * A `gint`.  FIXME: combine with #GCG_PHONE_LS_CALLER_NUM!
+   * A `gchararray` describing the state of the call.
    */
-  GCG_PHONE_LS_CALL_NUM
+  GCG_PHONE_LS_STATE_NAME,
+
+  /**
+   * A `GdkPixbuf` visualizing the state of the call.
+   * Not yet used.
+   */
+  GCG_PHONE_LS_STATE_PIXBUF
 
 };
 
@@ -158,7 +163,7 @@ enum OutCallState
   /**
    * This phone call is currently active.
    */
-  OUT_STATE_ACTIVE,
+  OUT_STATE_CONNECTED,
 
   /**
    * This phone call is currently suspended by local.
@@ -202,7 +207,7 @@ struct IncomingCall
   /**
    * Unique number of the caller.
    */
-  unsigned int caller_num;
+  guint caller_num;
 
   /**
    * State for this call.
@@ -236,7 +241,7 @@ struct OutgoingCall
   /**
    * Unique number of the caller.
    */
-  unsigned int caller_num;
+  guint caller_num;
 
   /**
    * State for this call.
@@ -273,14 +278,9 @@ static struct GNUNET_MICROPHONE_Handle *mic;
 
 
 /**
- * Counts the number of incoming calls we have had so far.
+ * Counts the number of incoming or outgoing calls we have had so far.
  */
-static unsigned int caller_num_gen;
-
-/**
- * Unique number of call (outgoing)
- */
-static unsigned int call_counter;
+static guint caller_num_gen;
 
 /**
  * Number of incoming calls that are currently ringing.
@@ -340,6 +340,70 @@ static GtkEntry *address_entry;
 
 
 /**
+ * Convert in call state to human readable string.
+ *
+ * @param is state to convert
+ * @return human readable description
+ */
+static const char *
+in_call_state_to_string (enum InCallState is)
+{
+  switch (is)
+  {
+  case IN_STATE_NONE:
+    return _("none");
+  case IN_STATE_RINGING:
+    return _("ringing");
+  case IN_STATE_CONNECTED:
+    return _("connected");
+  case IN_STATE_SUSPENDED_LOCAL:
+    return _("suspended");
+  case IN_STATE_SUSPENDED_REMOTE:
+    return _("on hold");
+  case IN_STATE_SUSPENDED_BOTH:
+    return _("suspended and on hold");
+  default:
+    GNUNET_break (0);
+    break;
+  }
+  return NULL;
+}
+
+
+/**
+ * Convert out call state to human readable string.
+ *
+ * @param os state to convert
+ * @return human readable description
+ */
+static const char *
+out_call_state_to_string (enum OutCallState os)
+{
+  switch (os)
+  {
+  case OUT_STATE_NONE:
+    return _("none");
+  case OUT_STATE_RESOLVING:
+    return _("resolving");
+  case OUT_STATE_RINGING:
+    return _("ringing");
+  case OUT_STATE_CONNECTED:
+    return _("connected");
+  case OUT_STATE_SUSPENDED_LOCAL:
+    return _("suspended");
+  case OUT_STATE_SUSPENDED_REMOTE:
+    return _("on hold");
+  case OUT_STATE_SUSPENDED_BOTH:
+    return _("suspended and on hold");
+  default:
+    GNUNET_break (0);
+    break;
+  }
+  return NULL;
+}
+
+
+/**
  * Free data structure associated with an incoming call.
  *
  * @param ic incoming call to free
@@ -453,9 +517,9 @@ update_call_buttons (GtkTreeSelection *sel)
   gtk_tree_model_get (model,
                       &iter,
                       GCG_PHONE_LS_TYPE, &type,
-                      GCG_PHONE_LS_CALL_STATE, &out_state,
-                      GCG_PHONE_LS_CALLER_STATE, &in_state,
-                      GCG_PHONE_LS_CALLER, &ic,
+                      GCG_PHONE_LS_OUT_CALL_STATE, &out_state,
+                      GCG_PHONE_LS_IN_CALL_STATE, &in_state,
+                      GCG_PHONE_LS_INCOMING_CALL, &ic,
                       -1);
   switch ((enum TypeOfConversation) type)
   {
@@ -513,7 +577,7 @@ update_call_buttons (GtkTreeSelection *sel)
       gtk_widget_set_sensitive (b_accept, ! in_call);
       gtk_widget_set_sensitive (b_refuse, FALSE);
       gtk_widget_set_sensitive (b_resume, ! in_call);
-    case OUT_STATE_ACTIVE:
+    case OUT_STATE_CONNECTED:
       gtk_widget_set_sensitive (b_add_contact, TRUE); 
       gtk_widget_set_sensitive (b_accept, FALSE);
       gtk_widget_set_sensitive (b_refuse, FALSE);
@@ -586,7 +650,7 @@ set_outgoing_call_state (struct OutgoingCall *oc,
     break;
   case OUT_STATE_RINGING:
     break;
-  case OUT_STATE_ACTIVE:
+  case OUT_STATE_CONNECTED:
     break;
   case OUT_STATE_SUSPENDED_LOCAL:
     break;
@@ -597,7 +661,8 @@ set_outgoing_call_state (struct OutgoingCall *oc,
   }
   gtk_list_store_set (active_liststore,
                       &iter,
-                      GCG_PHONE_LS_CALL_STATE, state,
+                      GCG_PHONE_LS_OUT_CALL_STATE, state,
+                      GCG_PHONE_LS_STATE_NAME, out_call_state_to_string (state),
                       -1);
   update_call_buttons (gtk_tree_view_get_selection (active_treeview));
 }
@@ -641,7 +706,8 @@ set_incoming_call_state (struct IncomingCall *ic,
   }
   gtk_list_store_set (active_liststore,
                       &iter,
-                      GCG_PHONE_LS_CALLER_STATE, state,
+                      GCG_PHONE_LS_IN_CALL_STATE, state,
+                      GCG_PHONE_LS_STATE_NAME, in_call_state_to_string (state),
                       -1);
   update_call_buttons (gtk_tree_view_get_selection (active_treeview));
 }
@@ -672,15 +738,17 @@ phone_event_handler (void *cls,
     in_ring_counter++;
     ic = GNUNET_new (struct IncomingCall);
     ic->caller = caller;
+    ic->state = IN_STATE_RINGING;
     ic->caller_id = GNUNET_strdup (caller_id);
     ic->caller_num = caller_num_gen++;
     gtk_list_store_insert_with_values (active_liststore,
                                        &iter,
                                        -1,
-                                       GCG_PHONE_LS_CALLER_ID, caller_id,
-                                       GCG_PHONE_LS_CALLER, ic,
-                                       GCG_PHONE_LS_CALLER_NUM, caller_num_gen,
-                                       GCG_PHONE_LS_CALLER_STATE, IN_STATE_RINGING,
+                                       GCG_PHONE_LS_REMOTE_USER_NAME, caller_id,
+                                       GCG_PHONE_LS_INCOMING_CALL, ic,
+                                       GCG_PHONE_LS_NUMBER, ic->caller_num,
+                                       GCG_PHONE_LS_IN_CALL_STATE, ic->state,
+                                       GCG_PHONE_LS_STATE_NAME, in_call_state_to_string (ic->state),
                                        GCG_PHONE_LS_TYPE, CALL_IN,
                                        -1);
     path = gtk_tree_model_get_path (GTK_TREE_MODEL (active_liststore),
@@ -690,7 +758,7 @@ phone_event_handler (void *cls,
     gtk_tree_path_free (path);
     GCG_log (_("A Incoming call from `%s' with number %u\n"),
              caller_id,
-             caller_num_gen);
+             ic->caller_num);
     break;
   case GNUNET_CONVERSATION_EC_PHONE_HUNG_UP:
     GNUNET_break (in_ring_counter > 0);
@@ -702,7 +770,7 @@ phone_event_handler (void *cls,
     {
       gtk_tree_model_get (GTK_TREE_MODEL (active_liststore),
                           &iter,
-                          GCG_PHONE_LS_CALLER, &ic,
+                          GCG_PHONE_LS_INCOMING_CALL, &ic,
                           -1);
       if (caller == ic->caller)
       {
@@ -843,7 +911,7 @@ GNUNET_CONVERSATION_GTK_on_accept_clicked (GtkButton *button,
   }
   gtk_tree_model_get (model,
                       &iter,
-                      GCG_PHONE_LS_CALLER, &ic,
+                      GCG_PHONE_LS_INCOMING_CALL, &ic,
                       -1);
   if (NULL == ic)
   {
@@ -854,7 +922,7 @@ GNUNET_CONVERSATION_GTK_on_accept_clicked (GtkButton *button,
   active_in = ic;
   set_incoming_call_state (ic,
                            IN_STATE_CONNECTED);
-  GCG_update_status_bar (_("Started a conversation with `%s'.\n"),
+  GCG_update_status_bar (_("Started a conversation with `%s'."),
                          ic->caller_id);
   GCG_set_status_icon ("gnunet-conversation-call-active");
   GNUNET_CONVERSATION_caller_pick_up (ic->caller,
@@ -893,8 +961,8 @@ GNUNET_CONVERSATION_GTK_on_reject_clicked (GtkButton *button,
   }
   gtk_tree_model_get (model,
                       &iter,
-                      GCG_PHONE_LS_CALLER, &ic,
-                      GCG_PHONE_LS_CALL, &oc,
+                      GCG_PHONE_LS_INCOMING_CALL, &ic,
+                      GCG_PHONE_LS_OUTGOING_CALL, &oc,
                       -1);
   if (NULL != ic)
   {
@@ -906,7 +974,7 @@ GNUNET_CONVERSATION_GTK_on_reject_clicked (GtkButton *button,
     }
     GNUNET_break (in_ring_counter > 0);
     in_ring_counter--;
-    GCG_update_status_bar (_("Rejected conversation with `%s'.\n"),
+    GCG_update_status_bar (_("Rejected conversation with `%s'."),
                            ic->caller_id);
     GCG_HISTORY_add (GCG_HISTORY_TYPE_REJECTED,
                      ic->caller_id);
@@ -925,7 +993,7 @@ GNUNET_CONVERSATION_GTK_on_reject_clicked (GtkButton *button,
       GNUNET_break (0);
       return;
     }
-    GCG_update_status_bar (_("Terminated suspended conversation with `%s'.\n"),
+    GCG_update_status_bar (_("Terminated suspended conversation with `%s'."),
                            oc->peer_name);
     GCG_HISTORY_add (GCG_HISTORY_TYPE_HANGUP,
                      oc->peer_name);
@@ -956,8 +1024,6 @@ GNUNET_CONVERSATION_GTK_use_current_button_clicked (GtkButton *button,
   const gchar *target;
 
   target = gtk_entry_get_text (address_entry);
-  gtk_entry_set_text (address_entry,
-                      "FIXME");
 #endif
 }
 
@@ -997,15 +1063,15 @@ GNUNET_CONVERSATION_GTK_on_resume_clicked (GtkButton *button,
   }
   gtk_tree_model_get (model,
                       &iter,
-                      GCG_PHONE_LS_CALLER, &ic,
-                      GCG_PHONE_LS_CALL, &oc,
+                      GCG_PHONE_LS_INCOMING_CALL, &ic,
+                      GCG_PHONE_LS_OUTGOING_CALL, &oc,
                       -1);
   if (NULL != ic)
   {
     active_in = ic;
     set_incoming_call_state (ic,
                              IN_STATE_CONNECTED);
-    GCG_update_status_bar (_("Resumed conversation with `%s'.\n"),
+    GCG_update_status_bar (_("Resumed conversation with `%s'."),
                            ic->caller_id);
     GCG_set_status_icon ("gnunet-conversation-call-active");
     GNUNET_CONVERSATION_caller_resume (ic->caller,
@@ -1020,7 +1086,7 @@ GNUNET_CONVERSATION_GTK_on_resume_clicked (GtkButton *button,
     GNUNET_CONVERSATION_call_resume (oc->call,
                                      speaker, mic);
     set_outgoing_call_state (oc,
-                             OUT_STATE_ACTIVE);
+                             OUT_STATE_CONNECTED);
     // GCG_HISTORY_add (GCG_HISTORY_TYPE_RESUMED, ic->caller_id);
     do_status ();
     return;
@@ -1064,7 +1130,7 @@ GNUNET_CONVERSATION_GTK_on_pause_clicked (GtkButton *button,
     case OUT_STATE_RINGING:
       GNUNET_assert (0);
       break;
-    case OUT_STATE_ACTIVE:
+    case OUT_STATE_CONNECTED:
       os = OUT_STATE_SUSPENDED_LOCAL;
       break;
     case OUT_STATE_SUSPENDED_LOCAL:
@@ -1229,7 +1295,7 @@ call_event_handler (void *cls,
     break;
   case GNUNET_CONVERSATION_EC_CALL_PICKED_UP:
     GNUNET_break (OUT_STATE_RINGING == oc->state);
-    set_outgoing_call_state (oc, OUT_STATE_ACTIVE);
+    set_outgoing_call_state (oc, OUT_STATE_CONNECTED);
     GNUNET_break (active_out == oc);
     gtk_widget_set_sensitive (b_suspend, TRUE);
     GCG_log (_("Connection established to `%s'."),
@@ -1285,7 +1351,7 @@ call_event_handler (void *cls,
     case OUT_STATE_RINGING:
       GNUNET_assert (0);
       break;
-    case OUT_STATE_ACTIVE:
+    case OUT_STATE_CONNECTED:
       os = OUT_STATE_SUSPENDED_REMOTE;
       break;
     case OUT_STATE_SUSPENDED_LOCAL:
@@ -1319,14 +1385,14 @@ call_event_handler (void *cls,
     case OUT_STATE_RINGING:
       GNUNET_assert (0);
       break;
-    case OUT_STATE_ACTIVE:
+    case OUT_STATE_CONNECTED:
       GNUNET_assert (0);
       break;
     case OUT_STATE_SUSPENDED_LOCAL:
       GNUNET_assert (0);
       break;
     case OUT_STATE_SUSPENDED_REMOTE:
-      os = OUT_STATE_ACTIVE;
+      os = OUT_STATE_CONNECTED;
       break;
     case OUT_STATE_SUSPENDED_BOTH:
       os = OUT_STATE_SUSPENDED_LOCAL;
@@ -1338,7 +1404,7 @@ call_event_handler (void *cls,
     GCG_log (_("Connection to `%s' resumed by remote\n"),
              oc->peer_name);
     set_outgoing_call_state (oc, os);
-    if (OUT_STATE_ACTIVE == os)
+    if (OUT_STATE_CONNECTED == os)
     {
       GCG_update_status_bar (_("Talking to `%s'."),
                              oc->peer_name);
@@ -1374,50 +1440,35 @@ call_event_handler (void *cls,
 
 
 /**
- * Initiate a new call.
+ * The "connect" button was clicked.  Initiate a call!
  *
- * @param arg address of the user to call
+ * @param button the button
+ * @param user_data builder (unused)
  */
 void
-GSC_PHONE_make_call (const char *arg)
+gnunet_conversation_gtk_call_button_clicked_cb (GtkButton *button,
+                                                gpointer user_data)
+
 {
   struct GNUNET_IDENTITY_Ego *caller_id;
   GtkTreePath *path;
   GtkTreeIter iter;
   struct OutgoingCall *oc;
+  const char *arg;
 
-  gtk_entry_set_text (address_entry,
-                      arg);
+  arg = gtk_entry_get_text (address_entry);
   caller_id = GCG_EGOS_get_selected_ego ();
-  if (NULL == caller_id)
-  {
-    /* can happen if user activated address in phone book
-       while our phone was still down (no ego selected) */
-    GCG_log (_("Caller ID unavailable, cannot initiate call to `%s'.\n"),
-             arg);
-    return;
-  }
-  if (NULL != active_out)
-  {
-    if (0 == strcmp (active_out->peer_name,
-                     arg))
-      return; /* user likely simply clicked a bit too often, ignore */
-    GCG_log (_("You are on the phone with `%s', suspend or hang up before trying to call `%s'!\n"),
-             active_out->peer_name,
-             arg);
-    return;
-  }
-  if (NULL != active_in)
+  if ( (NULL == caller_id) ||
+       (NULL != active_out) ||
+       (NULL != active_in) )
   {
-    GCG_log (_("You are on the phone with `%s', suspend or hang up before trying to call `%s'!\n"),
-             active_in->caller_id,
-             arg);
+    GNUNET_break (0);
     return;
   }
-  call_counter++;
   oc = GNUNET_new (struct OutgoingCall);
   oc->peer_name = GNUNET_strdup (arg);
   oc->state = OUT_STATE_RESOLVING;
+  oc->caller_num = caller_num_gen++;
   oc->call =
     GNUNET_CONVERSATION_call_start (GCG_get_configuration (),
                                     caller_id,
@@ -1427,14 +1478,15 @@ GSC_PHONE_make_call (const char *arg)
   gtk_list_store_insert_with_values (active_liststore,
                                      &iter,
                                      -1,
-                                     GCG_PHONE_LS_CALLER_ID, oc->peer_name,
-                                     GCG_PHONE_LS_CALLER, NULL,
-                                     GCG_PHONE_LS_CALLER_NUM, 0,
-                                     GCG_PHONE_LS_CALLER_STATE, IN_STATE_NONE,
+                                     GCG_PHONE_LS_REMOTE_USER_NAME, oc->peer_name,
+                                     GCG_PHONE_LS_INCOMING_CALL, NULL,
+                                     GCG_PHONE_LS_NUMBER, oc->caller_num,
+                                     GCG_PHONE_LS_IN_CALL_STATE, IN_STATE_NONE,
                                      GCG_PHONE_LS_TYPE, CALL_OUT,
-                                     GCG_PHONE_LS_CALL, oc,
-                                     GCG_PHONE_LS_CALL_NUM, call_counter,
-                                     GCG_PHONE_LS_CALL_STATE, OUT_STATE_RESOLVING,
+                                     GCG_PHONE_LS_OUTGOING_CALL, oc,
+                                     GCG_PHONE_LS_OUT_CALL_STATE, oc->state,
+                                     GCG_PHONE_LS_STATE_NAME, out_call_state_to_string (oc->state),
+
                                      -1); 
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (active_liststore),
                                   &iter);
@@ -1461,20 +1513,6 @@ GSC_PHONE_make_call (const char *arg)
 
 
 /**
- * The "connect" button was clicked.  Initiate a call!
- *
- * @param button the button
- * @param user_data builder (unused)
- */
-void
-gnunet_conversation_gtk_call_button_clicked_cb (GtkButton *button,
-                                                gpointer user_data)
-{
-  GSC_PHONE_make_call (gtk_entry_get_text (address_entry));
-}
-
-
-/**
  * The user has changed the address entry.  Consider activating the
  * "call" button.
  *
@@ -1526,7 +1564,7 @@ gnunet_conversation_gtk_ego_combobox_changed_cb (GtkComboBox *widget,
   if (NULL == phone)
   {
     GCG_update_status_bar ("%s",
-                           _("Failed to setup phone (internal error)\n"));
+                           _("Failed to setup phone (internal error)"));
     GCG_log ("%s",
              _("Failed to setup phone (internal error)\n"));
     GCG_set_status_icon ("gnunet-conversation-offline");