1 files changed, 59 insertions, 59 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index bcb6d7ca..0316db5f 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -20,11 +20,10 @@
 
 /**
  * @file src/conversation/gnunet-conversation-gtk_contacts.c
- * @brief 
+ * @brief
  * @author yids
  * @author hark
  */
-#include "gnunet-conversation-gtk_common.h"
 #include "gnunet-conversation-gtk.h"
 
 
@@ -43,10 +42,6 @@
 /*************
  * contacts  *
  *************/
-/**
- * Our configurations.
- */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
  * Our ego.
@@ -165,8 +160,10 @@ static struct GNUNET_NAMESTORE_QueueEntry *del_qe;
 
 ////////////////////////////
 static void
-display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
-                const char *rname, unsigned int rd_len,
+display_record (void *cls,
+                const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
+                const char *rname,
+                unsigned int rd_len,
                 const struct GNUNET_GNSRECORD_Data *rd)
 {
 /*  const char *typestring;*/
@@ -180,7 +177,7 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
 
   if (NULL == rname)
   {
-  
+
     list_it = NULL;
     //test_finished ();
     return;
@@ -239,7 +236,7 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
     GNUNET_free (s);
   }
 //  FPRINTF (stdout, "%s", "\n");
-  
+
   GNUNET_NAMESTORE_zone_iterator_next (list_it);
 //  GNUNET_NAMESTORE_zone_iteration_stop(list_it);
 
@@ -256,7 +253,9 @@ display_record (void *cls, const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
  * @param name name of the ego
  */
 static void
-identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
+identity_cb (void *cls,
+             struct GNUNET_IDENTITY_Ego *ego,
+             void **ctx,
              const char *name)
 {
 /*
@@ -264,9 +263,9 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
   char *s;
 */
   GtkTreeIter iter;
-  
-  if (NULL != ego) 
-  { 
+
+  if (NULL != ego)
+  {
 /*
   GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
   s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
@@ -279,17 +278,18 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
                                        &iter, -1,
                                        0, name,
                                        1, ego,
-                                       -1); 
+                                       -1);
 
   }
 
   contacts_ego = ego;
 
-  
+
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
-  ns = GNUNET_NAMESTORE_connect (cfg);
-     
+  ns = GNUNET_NAMESTORE_connect (GCG_get_configuration ());
 }
+
+
 /**
  * Continuation called to notify client about result of the
  * operation.
@@ -312,10 +312,10 @@ add_continuation (void *cls, int32_t success, const char *emsg)
     fprintf (stderr, _("Adding record failed: %s\n"),
              (GNUNET_NO == success) ? "record exists" : emsg);
     if (GNUNET_NO != success)
-      LOG("GNUNET_NO != success");
+      GCG_log("GNUNET_NO != success");
         //ret = 1;
   }
-  LOG("blaat");
+  GCG_log("blaat");
   //ret = 0;
   //test_finished ();
 }
@@ -362,19 +362,19 @@ add_contact (const gchar * name, const gchar * address)
   static void *data;
   static size_t data_size;
   struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
-  
+
   struct GNUNET_IDENTITY_Ego *tempEgo;
   char *tempName;
   GtkTreeIter testIter;
-  gtk_combo_box_get_active_iter(GTK_COMBO_BOX (GNUNET_CONVERSATION_GTK_get_main_window_object  ("gnunet_conversation_gtk_contacts_zone_combobox")), &testIter);
+  gtk_combo_box_get_active_iter(GTK_COMBO_BOX (GCG_get_main_window_object  ("gnunet_conversation_gtk_contacts_zone_combobox")), &testIter);
 
   gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
                       &testIter,
                       0, &tempName,
                       1, &tempEgo,
                       -1);
-  
-  
+
+
   GNUNET_CRYPTO_ecdsa_public_key_from_string (address, strlen (address), &pkey);
   rde = &rd;
   zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (tempEgo);
@@ -401,24 +401,22 @@ add_contact (const gchar * name, const gchar * address)
     gtk_list_store_set (contacts_liststore, &iter, 1, "PKEY", 0, name, -1);
   }
 }
-/*
+
+
+/**
  * executed when clicked on add contact
  * @param button
  * @param user_data
  */
-
 void
 GNUNET_CONVERSATION_GTK_on_add_clicked (GtkButton * button,
                                         gpointer * user_data)
 {
+  GtkEntry *nameEntry;
+  GtkEntry *addressEntry;
 
-  GtkEntry *nameEntry, *addressEntry;
-
-  nameEntry = GTK_ENTRY (GNUNET_CONVERSATION_GTK_get_main_window_object  ("GNUNET_GTK_conversation_nameAdd"));
-  addressEntry = GTK_ENTRY (GNUNET_CONVERSATION_GTK_get_main_window_object ("GNUNET_GTK_conversation_addressAdd"));
-  FPRINTF(stderr,"name %s \n", gtk_entry_get_text (nameEntry));
-  FPRINTF(stderr,"addr %s \n", gtk_entry_get_text (addressEntry));
-
+  nameEntry = GTK_ENTRY (GCG_get_main_window_object  ("GNUNET_GTK_conversation_nameAdd"));
+  addressEntry = GTK_ENTRY (GCG_get_main_window_object ("GNUNET_GTK_conversation_addressAdd"));
   add_contact (gtk_entry_get_text (nameEntry),gtk_entry_get_text(addressEntry));
 }
 
@@ -439,7 +437,7 @@ GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
   {
     gtk_tree_model_get (model, &iter, 0, &name, -1);
     //FPRINTF (stderr, "selected %s \n", name);
-    main_window = GTK_WINDOW (GNUNET_CONVERSATION_GTK_get_main_window_object  ("GNUNET_GTK_conversation_window"));
+    main_window = GTK_WINDOW (GCG_get_main_window_object  ("GNUNET_GTK_conversation_window"));
     confirm =
         GTK_DIALOG (gtk_dialog_new_with_buttons
                     ("Removing contact", main_window,
@@ -477,11 +475,11 @@ GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton * button,
 {
   GtkEntry *addressEntry;
 //  FPRINTF(stderr,"on current clicked %s\n",callerName);
-  //char *strippedAddress; 
-  addressEntry = GTK_ENTRY (GNUNET_CONVERSATION_GTK_get_main_window_object  ("GNUNET_GTK_conversation_addressAdd"));
+  //char *strippedAddress;
+  addressEntry = GTK_ENTRY (GCG_get_main_window_object  ("GNUNET_GTK_conversation_addressAdd"));
   currentlySelectedCallAddress[52] = '\0';
   gtk_entry_set_text(addressEntry, currentlySelectedCallAddress);
-    
+
 }
 
 
@@ -526,7 +524,7 @@ GNUNET_CONVERSATION_GTK_row_activated ()
   g_print ("ego name %s\n", callAddress);
   GtkEntry *address_entry;
 
-  address_entry = GTK_ENTRY ( GNUNET_CONVERSATION_GTK_get_main_window_object ("GNUNET_GTK_conversation_address"));
+  address_entry = GTK_ENTRY ( GCG_get_main_window_object ("GNUNET_GTK_conversation_address"));
   gtk_entry_set_text (address_entry, callAddress);
   do_call (callAddress);
 }
@@ -547,7 +545,7 @@ print_ego (void *cls,
 }
 */
 /*
-static void 
+static void
 setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
   currentAddressBookEgo = ego;
@@ -571,9 +569,9 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
   //GtkTreeSelection *selection;
   //GtkTreeIter iterA;
-  
 
-  gtk_combo_box_get_active_iter(widget, &contacts_zone_iter);   
+
+  gtk_combo_box_get_active_iter(widget, &contacts_zone_iter);
 
   gtk_tree_model_get (GTK_TREE_MODEL (zone_liststore),
                       &contacts_zone_iter,
@@ -587,62 +585,64 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   GNUNET_IDENTITY_ego_lookup (cfg,
                               tempName,
                               setCurrentAddressbookEgo,
-                              NULL); 
-*/        
+                              NULL);
+*/
   //selection = gtk_tree_view_get_selection (zone_treeview);
-  
+
   //gtk_tree_selection_get_selected (selection, &zone_treemodel, &iterA);
-  
+
   //gtk_tree_model_get_iter_first(zone_treemodel, &iterA);
   //gtk_tree_model_get (zone_treemodel, &iterA, 0, &tempName, 1, &tempEgo, -1);
- 
+
 
  list_it =
     GNUNET_NAMESTORE_zone_iteration_start (ns, &temp_zone_pkey, &display_record,
                                            NULL);
-  
+
 //  GNUNET_IDENTITY_disconnect (id);
 
 }
 
 
-    
-//////    
+
+//////
 extern void
 GNUNET_CONVERSATION_GTK_CONTACTS_init ()
 {
   GtkTreeIter iterContactsInit;
 
-  cfg = GIG_get_configuration ();
+
 
 
   // contacts
   contacts_liststore =
-      GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object
+      GTK_LIST_STORE (GCG_get_main_window_object
                       ("gnunet_conversation_gtk_contacts_liststore"));
   contacts_treeview =
-      GTK_TREE_VIEW (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_treeview"));
+      GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_treeview"));
   contacts_treemodel = GTK_TREE_MODEL (contacts_liststore);
 
     // zone list
   zone_liststore =
-     GTK_LIST_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore")); 
+     GTK_LIST_STORE (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore"));
 
 // zone_treestore =
-//      GTK_TREE_STORE (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_treestore"));
+//      GTK_TREE_STORE (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_treestore"));
   zone_treemodel = GTK_TREE_MODEL (zone_liststore);
  zone_treeview =
-      GTK_TREE_VIEW (get_object ("gnunet_conversation_gtk_zone_treeview"));
+      GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_zone_treeview"));
 
   gtk_tree_model_get_iter_first(zone_treemodel, &iterContactsInit);
   gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
 
-  gtk_combo_box_set_active_iter(GTK_COMBO_BOX (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
+  gtk_combo_box_set_active_iter(GTK_COMBO_BOX (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
 
-  id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
+  id = GNUNET_IDENTITY_connect (GCG_get_configuration (),
+                                &identity_cb,
+                                NULL);
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
-//  gtk_combo_box_set_active(GTK_WIDGET (get_object ("gnunet_conversation_gtk_contacts_zone_combobox")), 1);
-//  gtk_combo_box_set_active(GTK_WIDGET (get_object (ml,"gnunet_conversation_gtk_outgoing_zone_combobox")), 1);
+//  gtk_combo_box_set_active(GTK_WIDGET (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_combobox")), 1);
+//  gtk_combo_box_set_active(GTK_WIDGET (GCG_get_main_window_object (ml,"gnunet_conversation_gtk_outgoing_zone_combobox")), 1);
 
 }