1 files changed, 20 insertions, 23 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 4ae137d5..d3e1954f 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -74,22 +74,6 @@ static int tray_only;
  * phone     *
  *************/
 
-/**                      
- * Current state of iterating elements for the client.
- * NULL if we are not currently iterating.
- */
-static struct GNUNET_CONTAINER_MultiHashMapIterator *iter;
-
-/**
- *name of the incomming caller pkey or record name if known
- */
-static char *callerName;
-
-/**
- * peer id of a contact
- */
-static char *peer_id;
-
 /**
   * List of active calls
   */
@@ -103,7 +87,7 @@ static GtkTreeView *active_treeview;
 /**
  * List of incoming calls
  */
-static struct CallList
+struct CallList
 {
 
   /**
@@ -242,6 +226,11 @@ static GtkListStore *zone_liststore;
  */
 static struct GNUNET_IDENTITY_Ego *caller_id;
 
+
+void GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed ();
+
+void set_status_icon (const char *icon_name);
+
 /************
  * extern's *
  * **********/
@@ -713,6 +702,7 @@ enable_button (const char *button_name)
 /**
  * set state of outgoing call
  */
+void
 set_outgoing_call_state(struct GNUNET_CONVERSATION_Call *call, int state)
 {
     LOG("set state to: %u", state);
@@ -1276,8 +1266,14 @@ do_accept (struct GNUNET_CONVERSATION_Caller *sel_caller)
     phone_state = PS_ACCEPTED;
     set_incoming_call_state(sel_caller,CT_active);
     
-    
-    cl = sel_caller;
+    for (cl = cl_head; cl; cl = cl->next)
+    {
+      /* FIXME: this may not be unique enough to identify the right item!
+       * Why not store CallList items in treeview instead of just callers?
+       */
+      if (cl->caller == sel_caller)
+        break;
+    }
     GNUNET_CONVERSATION_caller_pick_up (sel_caller, &caller_event_handler, cl,
                                       speaker, mic);
 
@@ -1463,13 +1459,13 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
 {
 
   struct GNUNET_CRYPTO_EcdsaPublicKey pk;
-  char *s;
+
   GtkTreeIter iter;
   
   if (NULL != ego) 
   { 
   GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
-  s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
+
   fprintf (stderr, "main identity_cb: %s \n", name);
 
 
@@ -1519,6 +1515,7 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
 const struct GNUNET_CONFIGURATION_Handle *
 GIG_get_configuration ()
 {
+  /* FIXME: Configuration handle returned is const, but we DO alter the config */
   return GNUNET_GTK_main_loop_get_configuration (ml);
 }
 
@@ -1674,8 +1671,8 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   
   cfg = GIG_get_configuration ();
 
-  speaker = GNUNET_SPEAKER_create_from_hardware (GIG_get_configuration ());
-  mic = GNUNET_MICROPHONE_create_from_hardware (GIG_get_configuration ());
+  speaker = GNUNET_SPEAKER_create_from_hardware (cfg);
+  mic = GNUNET_MICROPHONE_create_from_hardware (cfg);
 
         b_contact = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_use_current_button"));
         b_accept  = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_accept_button"));