3 files changed, 44 insertions, 42 deletions

diff --git a/src/conversation/gnunet-conversation-gtk.c b/src/conversation/gnunet-conversation-gtk.c
index 010194f2..f6675966 100644
--- a/src/conversation/gnunet-conversation-gtk.c
+++ b/src/conversation/gnunet-conversation-gtk.c
@@ -1072,9 +1072,15 @@ call_event_handler (void *cls,
  *
  * @param arg arguments given to the command
  */
-extern void
-do_call (const char *arg)
+void
+GSC_do_call (const char *arg)
 {
+  GtkEntry *address_entry;
+
+  address_entry = GTK_ENTRY (GCG_get_main_window_object ("GNUNET_GTK_conversation_address"));
+  gtk_entry_set_text (address_entry,
+                      address);
+
   if (NULL == caller_id)
   {
     GCG_log (_("Ego `%s' not available\n"), ego_name);
@@ -1556,7 +1562,7 @@ GNUNET_CONVERSATION_GTK_on_call_clicked ()
 
   address_entry = GTK_ENTRY (GCG_get_main_window_object ("GNUNET_GTK_conversation_address"));
 
-  do_call (gtk_entry_get_text(address_entry));
+  GSC_do_call (gtk_entry_get_text(address_entry));
   //disable_button ("GNUNET_GTK_conversation_accept_button");
   do_status ();
 //  free(to_addr);
diff --git a/src/conversation/gnunet-conversation-gtk.h b/src/conversation/gnunet-conversation-gtk.h
index 66c0be7b..1064be4e 100644
--- a/src/conversation/gnunet-conversation-gtk.h
+++ b/src/conversation/gnunet-conversation-gtk.h
@@ -187,8 +187,13 @@ GCG_log (const char *message,
          ...);
 
 
+/**
+ * Initiate a call to the given address.
+ *
+ * @param address address to call
+ */
 extern void
-do_call(const char*);
+GSC_do_call (const char *address);
 
 
 
diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index 76be3909..70dec478 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -57,22 +57,12 @@ static struct GNUNET_IDENTITY_Ego *contacts_ego;
 static GtkListStore *contacts_liststore;
 
 /**
- * zone treeview
- */
-static GtkTreeView *zone_treeview;
-
-/**
- * zone tree model
- */
-static GtkTreeModel *zone_treemodel;
-
-/**
  * The main tree view for 'gns' that shows the records.
  */
 static GtkTreeView *contacts_treeview;
 
 /**
- * Tree model (same object as 'contacts_treestore', just different type).
+ * Tree model of the #contacts_treeview, same objects as #contacts_liststore.
  */
 static GtkTreeModel *contacts_treemodel;
 
@@ -292,54 +282,59 @@ GNUNET_CONVERSATION_GTK_on_remove_clicked (GtkButton * button,
  * FIXME: what was clicked where?
  */
 void
-GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton *button,
-                                            gpointer *user_data)
+GNUNET_CONVERSATION_GTK_use_current_button_clicked (GtkButton *button,
+                                                    gpointer *user_data)
 {
   GtkEntry *addressEntry;
 
   addressEntry = GTK_ENTRY (GCG_get_main_window_object ("GNUNET_GTK_conversation_addressAdd"));
   gtk_entry_set_text (addressEntry,
                       "FIXME");
-
 }
 
 
 /**
  * A row was activated in the contacts list. Initiate call.
  *
- * @return void
+ * @param tree_view view where the row was activated
+ * @param path path to the activated element
+ * @param column column that was activated
+ * @param user_data builder context (unused)
  */
 void
-GNUNET_CONVERSATION_GTK_row_activated ()
+GNUNET_CONVERSATION_GTK_row_activated  (GtkTreeView *tree_view,
+                                        GtkTreePath *path,
+                                        GtkTreeViewColumn *column,
+                                        gpointer user_data)
 {
   char *address;
   gchar *type;
-  GtkTreeSelection *selection;
-  GtkTreeIter iterA;
-  GtkEntry *address_entry;
+  GtkTreeIter iter;
 
-  selection = gtk_tree_view_get_selection (contacts_treeview);
-  gtk_tree_selection_get_selected (selection, &contacts_treemodel, &iterA);
+  gtk_tree_model_get_iter (contacts_treemodel,
+                           path,
+                           &iter);
   gtk_tree_model_get (contacts_treemodel,
-                      &iterA,
+                      &iter,
                       CONTACTS_LS_NAME, &name,
                       CONTACTS_LS_TYPE, &type,
                       -1);
   if (0 == strcmp (type, "PKEY"))
   {
-    GNUNET_asprintf (&address, "call.%s.gnu", name);
+    GNUNET_asprintf (&address,
+                     "call.%s.gnu",
+                     name);
   }
   else
   {
     GNUNET_assert (0 == strcmp (type, "PHONE"));
-    GNUNET_asprintf (&address, "%s.gnu", name);
+    GNUNET_asprintf (&address,
+                     "%s.gnu",
+                     name);
   }
+  g_free (name);
   g_free (type);
-
-  address_entry = GTK_ENTRY (GCG_get_main_window_object ("GNUNET_GTK_conversation_address"));
-  gtk_entry_set_text (address_entry,
-                      address);
-  do_call (address);
+  GSC_do_call (address);
   GNUNET_free (address);
 }
 
@@ -395,12 +390,12 @@ display_record (void *cls,
 
   /* check if exists, if so, update or remove */
   update = FALSE;
-  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (contacts_liststore),
+  if (gtk_tree_model_get_iter_first (contacts_treemodel,
                                      &iter))
   {
     do
     {
-      gtk_tree_model_get (GTK_TREE_MODEL(contacts_liststore),
+      gtk_tree_model_get (contacts_treemodel,
                           &iter,
                           CONTACTS_LS_NAME, &lname,
                           -1);
@@ -421,7 +416,7 @@ display_record (void *cls,
       }
       g_free (lname);
     }
-    while (gtk_tree_model_iter_next (GTK_TREE_MODEL(contacts_liststore),
+    while (gtk_tree_model_iter_next (contacts_treemodel,
                                      &iter));
   }
 
@@ -497,15 +492,11 @@ GCG_CONTACTS_init ()
   contacts_liststore
     = GTK_LIST_STORE (GCG_get_main_window_object
                       ("gnunet_conversation_gtk_contacts_liststore"));
-  contacts_treemodel = GTK_TREE_MODEL (contacts_liststore);
+  contacts_treemodel
+    = GTK_TREE_MODEL (contacts_liststore);
   contacts_treeview
     = GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_treeview"));
   // gtk_tree_view_set_activate_on_single_click (contacts_treeview, TRUE);
-
-  zone_treemodel
-    =  GTK_TREE_MODEL (GCG_get_main_window_object ("gnunet_conversation_gtk_contacts_zone_liststore"));
-  zone_treeview
-    = GTK_TREE_VIEW (GCG_get_main_window_object ("gnunet_conversation_gtk_zone_treeview"));
   ns = GNUNET_NAMESTORE_connect (GCG_get_configuration ());
 }