1 files changed, 13 insertions, 13 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 17fda5e5..f3e2bf0c 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -46,7 +46,7 @@
 /**
  * Our configurations.
  */
-static struct GNUNET_CONFIGURATION_Handle *cfg;
+//static struct GNUNET_CONFIGURATION_Handle *cfg;
 /**
  * Name of our ego.
  */
@@ -302,7 +302,7 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego, void **ctx,
 
   
 //  zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (caller_id);
-  ns = GNUNET_NAMESTORE_connect (cfg);
+  ns = GNUNET_NAMESTORE_connect (GIG_get_configuration ());
 
 
 //  list_it =
@@ -386,7 +386,7 @@ add_contact (const gchar * name, const gchar * address)
   struct GNUNET_IDENTITY_Ego *tempEgo;
   char *tempName;
   GtkTreeIter testIter;
-  gtk_combo_box_get_active_iter(GTK_WIDGET (GNUNET_CONVERSATION_GTK_get_main_window_object  ("gnunet_conversation_gtk_contacts_zone_combobox")), &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_tree_model_get (GTK_TREE_MODEL (zone_liststore),
                       &testIter,
@@ -466,7 +466,7 @@ GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
                      GTK_DIALOG_DESTROY_WITH_PARENT, _("Yes"),
                      GTK_RESPONSE_ACCEPT, _("No"), GTK_RESPONSE_CANCEL, NULL));
     content_area =
-        GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (confirm)));
+        GTK_HBOX (gtk_dialog_get_content_area (GTK_DIALOG (confirm)));
     notification =
         GTK_LABEL (gtk_label_new
                    ("Do you really want to remove this contact?"));
@@ -497,7 +497,7 @@ GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton * button,
 {
   GtkEntry *addressEntry;
 //  FPRINTF(stderr,"on current clicked %s\n",callerName);
-  char *strippedAddress; 
+  //char *strippedAddress; 
   addressEntry = GTK_ENTRY (GNUNET_CONVERSATION_GTK_get_main_window_object  ("GNUNET_GTK_conversation_addressAdd"));
   currentlySelectedCallAddress[52] = '\0';
   gtk_entry_set_text(addressEntry, currentlySelectedCallAddress);
@@ -535,11 +535,11 @@ GNUNET_CONVERSATION_GTK_row_activated ()
   g_print ("type @row active%s", type);
   if (strcmp (type, "PKEY") == 0)
   {
-    GNUNET_asprintf (&callAddress, "call\.%s\.gnu", name);
+    GNUNET_asprintf (&callAddress, "call.%s.gnu", name);
   }
   if (strcmp (type, "PHONE") == 0)
   {
-    GNUNET_asprintf (&callAddress, "%s\.gnu", name);
+    GNUNET_asprintf (&callAddress, "%s.gnu", name);
   }
 //   else { GNUNET_asprintf(&callAddress, "%s", peer_id);}
 
@@ -566,7 +566,7 @@ print_ego (void *cls,
 //  GNUNET_free (s);
 }
 */
-GNUNET_IDENTITY_EgoCallback 
+static void 
 setCurrentAddressbookEgo(void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
   currentAddressBookEgo = ego;
@@ -587,8 +587,8 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   struct GNUNET_IDENTITY_Ego *tempEgo;
   char *tempName;
   struct GNUNET_CRYPTO_EcdsaPrivateKey temp_zone_pkey;
-  GtkTreeSelection *selection;
-  GtkTreeIter iterA;
+  //GtkTreeSelection *selection;
+  //GtkTreeIter iterA;
   
 
   gtk_combo_box_get_active_iter(widget, &contacts_zone_iter);   
@@ -631,7 +631,7 @@ GNUNET_CONVERSATION_GTK_CONTACTS_init ()
 {
   GtkTreeIter iterContactsInit;
 
-  cfg = GIG_get_configuration ();
+  //cfg = GIG_get_configuration ();
 
 
   // contacts
@@ -655,9 +655,9 @@ GNUNET_CONVERSATION_GTK_CONTACTS_init ()
   gtk_tree_model_get_iter_first(zone_treemodel, &iterContactsInit);
   gtk_tree_model_iter_next(zone_treemodel, &iterContactsInit);
 
-  gtk_combo_box_set_active_iter(GTK_WIDGET (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
+  gtk_combo_box_set_active_iter(GTK_COMBO_BOX (GNUNET_CONVERSATION_GTK_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_combobox")), &iterContactsInit);
 
-  id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
+  id = GNUNET_IDENTITY_connect (GIG_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);