1 files changed, 44 insertions, 114 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 622db57f..010194f2 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -27,6 +27,7 @@
 #include "gnunet-conversation-gtk.h"
 #include "gnunet-conversation-gtk_history.h"
 #include "gnunet-conversation-gtk_contacts.h"
+#include "gnunet-conversation-gtk_egos.h"
 
 
 /**
@@ -164,11 +165,6 @@ static struct GNUNET_SPEAKER_Handle *speaker;
 static struct GNUNET_MICROPHONE_Handle *mic;
 
 /**
- * Handle to identity service.
- */
-static struct GNUNET_IDENTITY_Handle *id;
-
-/**
  * Name of conversation partner (if any).
  */
 static char *peer_name;
@@ -1315,98 +1311,45 @@ do_resume ()
 static void
 do_reject ()
 {
-
-  if (call_selected == NULL && caller_selected == NULL){
-      GNUNET_break(0);
-  }else {
-
-  // if selected call is outgoing, stop it
-  if (NULL != call_selected)
+  if (call_selected == NULL && caller_selected == NULL)
   {
-    set_outgoing_call_state(call_selected,CT_hangup);
-
-    GNUNET_CONVERSATION_call_stop(call);
-    //GNUNET_CONVERSATION_call_stop (call_selected);
-
-    call = NULL;
-    call_selected = NULL;
-    return;
-  } else
-
-  // if selected call is incoming, hang it up
-  if (NULL != caller_selected)
-  {
-    set_incoming_call_state(caller_selected,CT_hangup);
-    //FPRINTF(stderr,"hangup: %u", caller_selected);
-    GNUNET_CONVERSATION_caller_hang_up(caller_selected);
-    //cl_active = NULL;
-    phone_state = PS_LISTEN;
-    caller_selected = NULL;
-  } else {
-      GNUNET_break(0);
+    GNUNET_break(0);
   }
-    }
-}
+  else
+  {
+    // if selected call is outgoing, stop it
+    if (NULL != call_selected)
+    {
+      set_outgoing_call_state(call_selected,CT_hangup);
 
+      GNUNET_CONVERSATION_call_stop(call);
+      //GNUNET_CONVERSATION_call_stop (call_selected);
 
-/**
- * Function called by identity service with information about egos.
- *
- * @param cls NULL
- * @param ego ego handle
- * @param ctx unused
- * @param name name of the ego
- */
-static void
-identity_cb (void *cls,
-             struct GNUNET_IDENTITY_Ego *ego,
-             void **ctx,
-             const char *name)
-{
-  struct GNUNET_CRYPTO_EcdsaPublicKey pk;
-  GtkTreeIter iter;
-
-  if (NULL != ego)
-  {
-    GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-    gtk_list_store_insert_with_values (zone_liststore,
-                                       &iter, -1,
-                                       0, name,
-                                       1, ego,
-                                       -1);
-  }
-  if (NULL == name)
-    return;
-  if (ego == caller_id)
-  {
-    if (verbose)
-      GCG_log (_("Name of our ego changed to `%s'\n"),
-               name);
-    GNUNET_free_non_null (ego_name);
-    ego_name = GNUNET_strdup (name);
-    return;
-  }
-  if (0 != strcmp (name, ego_name))
-    return;
-  if (NULL == ego)
-  {
-    if (verbose)
-      GCG_log (_("Our ego `%s' was deleted!\n"),
-               ego_name);
-    caller_id = NULL;
-    return;
+      call = NULL;
+      call_selected = NULL;
+      return;
+    }
+    else
+    {
+      // if selected call is incoming, hang it up
+      if (NULL != caller_selected)
+      {
+        set_incoming_call_state(caller_selected,CT_hangup);
+        //FPRINTF(stderr,"hangup: %u", caller_selected);
+        GNUNET_CONVERSATION_caller_hang_up(caller_selected);
+        //cl_active = NULL;
+        phone_state = PS_LISTEN;
+        caller_selected = NULL;
+      }
+      else
+      {
+        GNUNET_break(0);
+      }
+    }
   }
-  caller_id = ego;
-
-  // do not remove this, it tells the phone which line to use
-  GNUNET_CONFIGURATION_set_value_number (cfg,
-                                         "CONVERSATION",
-                                         "LINE",
-                                         line);
-  if (NULL == phone)
-    start_phone();
 }
 
+
 /**
  * Get our configuration.
  *
@@ -1420,8 +1363,6 @@ GCG_get_configuration ()
 }
 
 
-
-
 /**
  * Task run on shutdown.
  *
@@ -1429,7 +1370,8 @@ GCG_get_configuration ()
  * @param tc scheduler context, unused
  */
 static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls,
+               const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
 
 //TODO: make this work
@@ -1447,12 +1389,9 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                  oc);
     GNUNET_free (oc);
   }
-  if (NULL != identity)
-  {
-    GNUNET_IDENTITY_disconnect (identity);
-    identity = NULL;
-  }
   */
+  GCG_CONTACTS_shutdown();
+  GCG_EGOS_shutdown();
   GNUNET_GTK_tray_icon_destroy ();
   GNUNET_GTK_main_loop_quit (ml);
   ml = NULL;
@@ -1479,18 +1418,6 @@ GNUNET_GTK_conversation_quit_cb (GObject *object,
     GNUNET_CONVERSATION_phone_destroy (phone);
     phone = NULL;
   }
-  if (NULL != id)
-  {
-    GNUNET_IDENTITY_disconnect (id);
-    id = NULL;
-  }
-  //if (NULL != ns)
-  //{
-  //  GNUNET_NAMESTORE_disconnect (ns);
-  //  ns = NULL;
-  //}
-  GNUNET_CONVERSATION_GTK_CONTACTS_shutdown();
-
   GNUNET_SPEAKER_destroy (speaker);
   speaker = NULL;
   GNUNET_MICROPHONE_destroy (mic);
@@ -1498,7 +1425,6 @@ GNUNET_GTK_conversation_quit_cb (GObject *object,
   ego_name = NULL;
   //GNUNET_free_non_null (peer_name);
   phone_state = PS_ERROR;
-
   GNUNET_SCHEDULER_shutdown ();
 }
 
@@ -1552,6 +1478,11 @@ run (void *cls,
                                 &shutdown_task,
                                 NULL);
   cfg = GNUNET_CONFIGURATION_dup (GCG_get_configuration ());
+  if (0 != line)
+    GNUNET_CONFIGURATION_set_value_number (cfg,
+                                           "CONVERSATION",
+                                           "LINE",
+                                           line);
   speaker = GNUNET_SPEAKER_create_from_hardware (cfg);
   mic = GNUNET_MICROPHONE_create_from_hardware (cfg);
   b_contact = GTK_WIDGET (GCG_get_main_window_object ("GNUNET_GTK_conversation_use_current_button"));
@@ -1564,9 +1495,8 @@ run (void *cls,
     ego_name = "phone-ego";
     GCG_log (_("No ego given, using default: %s "), ego_name);
   }
-  id = GNUNET_IDENTITY_connect (cfg,
-                                &identity_cb, NULL);
-  GNUNET_CONVERSATION_GTK_CONTACTS_init ();
+  GCG_EGOS_init ();
+  GCG_CONTACTS_init ();
 }