1 files changed, 217 insertions, 227 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 7b6b9fa6..80766cae 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -34,19 +34,23 @@ struct GNUNET_CONVERSATION_Caller *caller_selected = NULL;
  * common    *
  *************/
 
+/**
+ * Handle to our main loop.
+ */
+static struct GNUNET_GTK_MainLoop *ml;
+
+
 
 /**
  * Get our configuration.
  *
  * @return configuration handle
- */
-const struct GNUNET_CONFIGURATION_Handle *
-GIG_get_configuration ();
-
-/**
- * Our configurations.
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+ **/
+extern struct GNUNET_CONFIGURATION_Handle *
+GIG_get_configuration ()
+{
+      return GNUNET_GTK_main_loop_get_configuration (ml);
+}
 
 /**
  * Name of our ego.
@@ -222,19 +226,13 @@ static GtkListStore *zone_liststore;
 /**
  * zone tree model
  */
-static GtkTreeModel *zone_treemodel;
+//static GtkTreeModel *zone_treemodel;
 
 /**
  * Our ego.
  */
 static struct GNUNET_IDENTITY_Ego *caller_id;
 
-
-/**
- * Handle to our main loop.
- */
-static struct GNUNET_GTK_MainLoop *ml;
-
 /************
  * extern's *
  * **********/
@@ -293,6 +291,186 @@ update_state ()
 {
 //    LOG('update_state called',NULL);
 }
+/*
+ * @brief print info for currently selected call
+ */
+void
+print_call_info()
+{
+    GtkTreeIter gtkiter;
+    gboolean valid;
+    gint row_count = 0;
+
+    valid = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( active_liststore ), &gtkiter ); 
+    
+    if (!valid) 
+        GNUNET_break(0);
+    
+    while (valid)
+    {
+      gchar *str_data;
+      gint   int_data;
+      gpointer cl_caller;
+     
+      gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), &gtkiter, 
+                          AL_caller, &cl_caller,
+                          AL_caller_id,&str_data,
+                          AL_caller_num,&int_data,-1);
+      if (caller_selected == cl_caller)
+      {
+       // LOG (_("info for active call:%s number: %u row: %u"), str_data,int_data,row_count);
+        currentlySelectedCallAddress = str_data;
+//      FPRINTF(stderr,"cal addr: %s\n",currentlySelectedCallAddress);
+        break ;
+      }
+    g_free (str_data);
+    row_count++;
+    valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(active_liststore), &gtkiter);
+    }
+
+
+
+}
+
+
+
+/*
+ * @brief sets caller_selected, and enables or disables the active call list buttons
+ */
+void
+update_active_call_list_buttons()
+{
+   gchar *caller_id;
+   gpointer cl_caller;
+   gint     cl_caller_state;
+   //gint     cl_caller_type;
+   GtkTreeSelection *active_selection;
+   GtkTreeIter gcl_selected;
+//   active_liststore_selection = get_object(ml,"GNUNET_CONVERSATION_GTK_active_calls_selection");
+
+   active_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (active_treeview));
+
+
+   if (gtk_tree_selection_get_selected(active_selection,NULL,&gcl_selected))
+   {
+
+        gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), &gcl_selected, 
+                            AL_caller, &cl_caller,
+                            AL_caller_id, &caller_id,
+                            AL_caller_state, &cl_caller_state,
+                            -1);
+                 
+        caller_selected = cl_caller;
+
+        gtk_widget_show(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons" )));
+
+
+        // make global?
+        GtkWidget *b_contact, *b_accept, *b_hangup, *b_suspend, *b_resume;
+        b_contact = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_use_current_button"));
+        b_accept  = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_accept_button"));
+        b_hangup  = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_hangup_button"));
+        b_suspend = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_suspend_button"));
+        b_resume  = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_resume_button"));
+
+        LOG("caller state: %u phone_state: %u",cl_caller_state, phone_state);
+        
+        switch (cl_caller_state) 
+        {
+            /* buttons:
+             *  contact
+             *  accept
+             *  hangup
+             *  suspend
+             *  resume
+             *
+             *  TODO: check if there is incoming or outgoing call, 
+             *         disable resume and accept buttons.
+             *         or suspend that other call
+             */
+
+            case CT_active:
+            // hangup, pause
+            //LOG("CT_active state: %u ",cl_caller_state);
+            gtk_widget_set_sensitive(b_contact, 1);
+            gtk_widget_set_sensitive(b_accept, 0);
+            gtk_widget_set_sensitive(b_hangup, 1);
+            gtk_widget_set_sensitive(b_suspend, 1);
+            gtk_widget_set_sensitive(b_resume, 0);
+            break;
+            case CT_ringing:
+            // pickup, phonebook
+            //LOG("CT_ring show button");
+            gtk_widget_set_sensitive(b_contact, 1);
+            if (phone_state == PS_LISTEN)
+            {
+            gtk_widget_set_sensitive(b_accept, 1);
+            }else{
+            gtk_widget_set_sensitive(b_accept, 0);
+            }
+
+            
+            gtk_widget_set_sensitive(b_hangup, 0);
+            gtk_widget_set_sensitive(b_suspend, 0);
+            gtk_widget_set_sensitive(b_resume, 0);
+            break;
+            case CT_rejected:
+            //add to phonebook
+            //LOG("CT_rejected ");
+            gtk_widget_set_sensitive(b_contact, 1);
+            gtk_widget_set_sensitive(b_accept, 0);
+            gtk_widget_set_sensitive(b_hangup, 0);
+            gtk_widget_set_sensitive(b_suspend, 0);
+            gtk_widget_set_sensitive(b_resume, 0);
+
+            break;
+            case CT_suspended:
+            // resume, hangup
+            //LOG("CT_suspended ");
+            gtk_widget_set_sensitive(b_contact, 1 );
+            gtk_widget_set_sensitive(b_accept, 0);
+            gtk_widget_set_sensitive(b_hangup, 1);
+            gtk_widget_set_sensitive(b_suspend, 0);
+            
+            if (phone_state == PS_LISTEN)
+            {
+            LOG("enable resume button");
+            gtk_widget_set_sensitive(b_resume, 1);
+            }else{
+            LOG("disable resume button");
+            gtk_widget_set_sensitive(b_resume, 0);
+            }
+            break;
+            default:
+            GNUNET_break(0);
+            break;
+        }        
+       print_call_info();    
+   }
+   else
+   {
+    
+    LOG("nothing selected");
+    
+    gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons" )));
+    
+   }
+
+} //end function
+
+
+
+/*
+ * @brief executed when selecting a different item in active call list
+ */
+
+void
+GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed()
+{
+    update_active_call_list_buttons();
+}
+
+
 
 /**
  * update status
@@ -341,11 +519,8 @@ update_status (const gchar * message)
 void
 set_status_icon (const char *icon_name)
 {
-  GtkWindow *main_window;
   GtkImage *status_icon;
 
-  main_window = GTK_WINDOW (get_object ("GNUNET_GTK_conversation_window"));
-
   status_icon = GTK_IMAGE (get_object ("GNUNET_GTK_status_icon"));
 
   gtk_image_set_from_icon_name (status_icon, icon_name, GTK_ICON_SIZE_BUTTON);
@@ -619,7 +794,7 @@ start_phone ()
   }
   //GNUNET_assert (NULL == phone);
   phone =
-      GNUNET_CONVERSATION_phone_create (cfg, caller_id, &phone_event_handler,
+      GNUNET_CONVERSATION_phone_create (GIG_get_configuration(), caller_id, &phone_event_handler,
                                         NULL);
   /* FIXME: get record and print full GNS record info later here... */
   if (NULL == phone)
@@ -730,7 +905,7 @@ do_call (const char *arg)
   call_state = CS_RESOLVING;
   GNUNET_assert (NULL == call);
   call =
-     GNUNET_CONVERSATION_call_start (cfg, caller_id, arg, speaker, mic,
+     GNUNET_CONVERSATION_call_start (GIG_get_configuration(), caller_id, arg, speaker, mic,
                                       &call_event_handler, NULL);
   UPDATE_STATUS (_("We are calling `%s', his phone should be ringing."),
                  peer_name);
@@ -747,7 +922,7 @@ static void
 do_accept (struct GNUNET_CONVERSATION_Caller *sel_caller)
 {
   struct CallList *cl;
-  char buf[32];
+  //char buf[32];
 
 
   if ((NULL != call) && (CS_SUSPENDED != call_state))
@@ -805,6 +980,7 @@ do_accept (struct GNUNET_CONVERSATION_Caller *sel_caller)
     set_incoming_call_state(sel_caller,CT_active);
     
     
+    cl = NULL;
     GNUNET_CONVERSATION_caller_pick_up (sel_caller, &caller_event_handler, cl,
                                       speaker, mic);
 
@@ -955,8 +1131,8 @@ do_suspend (struct GNUNET_CONVERSATION_Caller *sel_caller)
 static void
 do_resume (struct GNUNET_CONVERSATION_Caller *sel_caller)
 {
-  struct CallList *cl;
-  char buf[32];
+  //struct CallList *cl;
+  //char buf[32];
 /*
   if (NULL != call)
   {
@@ -1024,8 +1200,8 @@ do_resume (struct GNUNET_CONVERSATION_Caller *sel_caller)
 static void
 do_reject (struct GNUNET_CONVERSATION_Caller *sel_caller)
 {
-  struct CallList *cl;
-  char buf[32];
+  //struct CallList *cl;
+  //char buf[32];
 
   /*
   if (NULL != call)
@@ -1114,9 +1290,9 @@ static void
 identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
              const char *name)
 {
-  struct GNUNET_CRYPTO_EcdsaPublicKey pk;
-  char *s;
-  GtkTreeIter iter;
+ // struct GNUNET_CRYPTO_EcdsaPublicKey pk;
+ // char *s;
+//  GtkTreeIter iter;
 
   if (NULL == name)
     return;
@@ -1138,7 +1314,9 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
     return;
   }
   caller_id = ego;
-  GNUNET_CONFIGURATION_set_value_number (cfg, "CONVERSATION", "LINE", line);
+  
+
+  //GNUNET_CONFIGURATION_set_value_number (GIG_get_configuration(), "CONVERSATION_GTK", "LINE", line);
   //zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
  // ns = GNUNET_NAMESTORE_connect (cfg);
 
@@ -1147,17 +1325,6 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
         start_phone();
 }
 
-/**
- * Get our configuration.
- *
- * @return configuration handle
- */
-const struct GNUNET_CONFIGURATION_Handle *
-GIG_get_configuration ()
-{
-  return GNUNET_GTK_main_loop_get_configuration (ml);
-}
-
 
 
 
@@ -1268,7 +1435,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   /* setup main window */
   main_window = GTK_WINDOW (get_object ("GNUNET_GTK_conversation_window"));
   main_window =
-      GTK_WIDGET (GNUNET_GTK_plug_me
+      GTK_WINDOW (GNUNET_GTK_plug_me
                   ("GNUNET_CONVERSATION_GTK_PLUG", GTK_WIDGET (main_window)));
   gtk_window_set_default_size (main_window, 700, 700);
   
@@ -1278,7 +1445,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   active_treeview =
       GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_active_calls_treeview"));
 
-  GNUNET_CONVERSATION_GTK_history_init();
+  GNUNET_CONVERSATION_GTK_CONTACTS_init();
 
 //gtk_tree_view_set_activate_on_single_click(contacts_treeview, TRUE);
 
@@ -1307,7 +1474,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
                                 NULL);
   
-  cfg = GIG_get_configuration ();
+  //cfg = GIG_get_configuration ();
 
   speaker = GNUNET_SPEAKER_create_from_hardware (GIG_get_configuration ());
   mic = GNUNET_MICROPHONE_create_from_hardware (GIG_get_configuration ());
@@ -1318,7 +1485,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     LOG (_("No ego given, using default: %s "), ego_name);
 
   }
-  id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
+  id = GNUNET_IDENTITY_connect (GIG_get_configuration(), &identity_cb, NULL);
  
   GNUNET_CONVERSATION_GTK_CONTACTS_init ();
 }
@@ -1369,13 +1536,11 @@ main (int argc, char *const *argv)
 void
 GNUNET_CONVERSATION_GTK_on_call_clicked ()
 {
-  char *to_addr;
   GtkEntry *address_entry;
 
   address_entry = GTK_ENTRY (get_object ("GNUNET_GTK_conversation_address"));
-  to_addr = gtk_entry_get_text (address_entry);
 
-  do_call (to_addr);
+  do_call (gtk_entry_get_text(address_entry));
   //disable_button ("GNUNET_GTK_conversation_accept_button");
   do_status ();
 //  free(to_addr);
@@ -1473,8 +1638,8 @@ gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb (GtkComboBox *widget,
   GtkTreeIter iter;
   struct GNUNET_IDENTITY_Ego *tempEgo;
   char *tempName;
-  struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
-  GtkTreeSelection *selection;
+  //struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
+  //GtkTreeSelection *selection;
 
 
   gtk_combo_box_get_active_iter(widget, &iter);
@@ -1484,7 +1649,7 @@ gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb (GtkComboBox *widget,
                       0, &tempName,
                       1, &tempEgo,
                       -1);
-  LOG(stderr,"outgoing ego: %s", tempName);
+  //LOG(stderr,"outgoing ego: %s", tempName);
  // caller_id = tempEgo;
   /*
   if ( NULL != phone)
@@ -1497,181 +1662,6 @@ gnunet_conversation_gtk_outgoing_zone_combobox_changed_cb (GtkComboBox *widget,
 }
 
 /*
- * @brief print info for currently selected call
- */
-void
-print_call_info()
-{
-    GtkTreeIter gtkiter;
-    gboolean valid;
-    gint row_count = 0;
-
-    valid = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( active_liststore ), &gtkiter ); 
-    
-    if (!valid) 
-        GNUNET_break(0);
-    
-    while (valid)
-    {
-      gchar *str_data;
-      gint   int_data;
-      gpointer cl_caller;
-     
-      gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), &gtkiter, 
-                          AL_caller, &cl_caller,
-                          AL_caller_id,&str_data,
-                          AL_caller_num,&int_data,-1);
-      if (caller_selected == cl_caller)
-      {
-       // LOG (_("info for active call:%s number: %u row: %u"), str_data,int_data,row_count);
-        currentlySelectedCallAddress = str_data;
-//      FPRINTF(stderr,"cal addr: %s\n",currentlySelectedCallAddress);
-        break ;
-      }
-    g_free (str_data);
-    row_count++;
-    valid = gtk_tree_model_iter_next (GTK_TREE_MODEL(active_liststore), &gtkiter);
-    }
-
-
-
-}
-
-/*
- * @brief executed when selecting a different item in active call list
- */
-
-void
-GNUNET_CONVERSATION_GTK_on_active_calls_selection_changed()
-{
-    update_active_call_list_buttons();
-}
-
-/*
- * @brief sets caller_selected, and enables or disables the active call list buttons
- */
-void
-update_active_call_list_buttons()
-{
-   gchar *caller_id;
-   gpointer cl_caller;
-   gint     cl_caller_state;
-   gint     cl_caller_type;
-   GtkTreeSelection *active_selection;
-   GtkTreeIter gcl_selected;
-//   active_liststore_selection = get_object(ml,"GNUNET_CONVERSATION_GTK_active_calls_selection");
-
-   active_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (active_treeview));
-
-
-   if (gtk_tree_selection_get_selected(active_selection,NULL,&gcl_selected))
-   {
-
-        gtk_tree_model_get (GTK_TREE_MODEL(active_liststore), &gcl_selected, 
-                            AL_caller, &cl_caller,
-                            AL_caller_id, &caller_id,
-                            AL_caller_state, &cl_caller_state,
-                            -1);
-                 
-        caller_selected = cl_caller;
-
-        gtk_widget_show(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons" )));
-
-
-        // make global?
-        GtkWidget *b_contact, *b_accept, *b_hangup, *b_suspend, *b_resume;
-        b_contact = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_use_current_button"));
-        b_accept  = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_accept_button"));
-        b_hangup  = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_hangup_button"));
-        b_suspend = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_suspend_button"));
-        b_resume  = GTK_WIDGET (get_object ("GNUNET_GTK_conversation_resume_button"));
-
-        LOG("caller state: %u phone_state: %u",cl_caller_state, phone_state);
-        
-        switch (cl_caller_state) 
-        {
-            /* buttons:
-             *  contact
-             *  accept
-             *  hangup
-             *  suspend
-             *  resume
-             *
-             *  TODO: check if there is incoming or outgoing call, 
-             *         disable resume and accept buttons.
-             *         or suspend that other call
-             */
-
-            case CT_active:
-            // hangup, pause
-            //LOG("CT_active state: %u ",cl_caller_state);
-            gtk_widget_set_sensitive(b_contact, 1);
-            gtk_widget_set_sensitive(b_accept, 0);
-            gtk_widget_set_sensitive(b_hangup, 1);
-            gtk_widget_set_sensitive(b_suspend, 1);
-            gtk_widget_set_sensitive(b_resume, 0);
-            break;
-            case CT_ringing:
-            // pickup, phonebook
-            //LOG("CT_ring show button");
-            gtk_widget_set_sensitive(b_contact, 1);
-            if (phone_state == PS_LISTEN)
-            {
-            gtk_widget_set_sensitive(b_accept, 1);
-            }else{
-            gtk_widget_set_sensitive(b_accept, 0);
-            }
-
-            
-            gtk_widget_set_sensitive(b_hangup, 0);
-            gtk_widget_set_sensitive(b_suspend, 0);
-            gtk_widget_set_sensitive(b_resume, 0);
-            break;
-            case CT_rejected:
-            //add to phonebook
-            //LOG("CT_rejected ");
-            gtk_widget_set_sensitive(b_contact, 1);
-            gtk_widget_set_sensitive(b_accept, 0);
-            gtk_widget_set_sensitive(b_hangup, 0);
-            gtk_widget_set_sensitive(b_suspend, 0);
-            gtk_widget_set_sensitive(b_resume, 0);
-
-            break;
-            case CT_suspended:
-            // resume, hangup
-            //LOG("CT_suspended ");
-            gtk_widget_set_sensitive(b_contact, 1 );
-            gtk_widget_set_sensitive(b_accept, 0);
-            gtk_widget_set_sensitive(b_hangup, 1);
-            gtk_widget_set_sensitive(b_suspend, 0);
-            
-            if (phone_state == PS_LISTEN)
-            {
-            LOG("enable resume button");
-            gtk_widget_set_sensitive(b_resume, 1);
-            }else{
-            LOG("disable resume button");
-            gtk_widget_set_sensitive(b_resume, 0);
-            }
-            break;
-            default:
-            GNUNET_break(0);
-            break;
-        }        
-       print_call_info();    
-   }
-   else
-   {
-    
-    LOG("nothing selected");
-    
-    gtk_widget_hide(GTK_WIDGET(get_object("GNUNET_GTK_conversation_active_call_list_buttons" )));
-    
-   }
-
-} //end function
-
-/*
  * @brief active call list type data function
  */
 void
@@ -1744,7 +1734,7 @@ void
 GNUNET_CONVERSATION_GTK_test_button_two()
 {
  GtkTreeViewColumn *column;
- GtkCellRenderer *cell;
+// GtkCellRenderer *cell;
  GtkCellRenderer *renderer;
  //LOG("test");
 // treeview = get_object(ml,"gnunet_conversation_gtk_active_calls_treeview");
@@ -1754,7 +1744,7 @@ GNUNET_CONVERSATION_GTK_test_button_two()
 // cell = get_object(ml,"GNUNET_CONVERSATION_GTK_active_calls_type");
 // gtk_tree_view_column_set_cell_data_func(column, cell, active_calls_type_data_function, NULL, NULL );
 
- column = get_object("caller_testcolumn");
+ column = GTK_TREE_VIEW_COLUMN(get_object("caller_testcolumn"));
  gtk_tree_view_column_set_title(column, "test stateC");
  renderer = gtk_cell_renderer_text_new();