1 files changed, 8 insertions, 7 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_phone.c b/src/conversation/gnunet-conversation-gtk_phone.c
index 7f2f90a0..49f15893 100644
--- a/src/conversation/gnunet-conversation-gtk_phone.c
+++ b/src/conversation/gnunet-conversation-gtk_phone.c
@@ -566,13 +566,14 @@ static void
 check_call_sensitivity ()
 {
   gboolean sens;
+  const char *tld;
 
   sens = (NULL == active_in) && (NULL == active_out);
   if (0 == strlen (gtk_entry_get_text (address_entry)))
     sens = FALSE;
   if (NULL == phone)
     sens = FALSE;
-  if (NULL == GCG_ZONES_get_selected_zone ())
+  if (NULL == GCG_ZONES_get_selected_zone (&tld))
     sens = FALSE;
   gtk_widget_set_sensitive (b_call, sens);
 }
@@ -903,6 +904,7 @@ phone_event_handler (void *cls,
   struct IncomingCall *ic;
   GtkTreePath *path;
   struct GNUNET_IDENTITY_Ego *my_zone;
+  const char *tld;
 
   switch (code)
   {
@@ -914,7 +916,7 @@ phone_event_handler (void *cls,
     ic->caller_id = *caller_id;
     ic->caller_id_str = GNUNET_strdup (GNUNET_GNSRECORD_pkey_to_zkey (caller_id));
 
-    my_zone = GCG_ZONES_get_selected_zone ();
+    my_zone = GCG_ZONES_get_selected_zone (&tld);
     ic->qe = GNUNET_NAMESTORE_zone_to_name (GCG_IMPORT_get_namestore (),
                                             GNUNET_IDENTITY_ego_get_private_key (my_zone),
                                             &ic->caller_id,
@@ -1567,7 +1569,6 @@ gnunet_conversation_gtk_call_button_clicked_cb (GtkButton *button,
 
 {
   struct GNUNET_IDENTITY_Ego *caller_id;
-  struct GNUNET_IDENTITY_Ego *zone_id;
   GtkTreePath *path;
   GtkTreeIter iter;
   struct OutgoingCall *oc;
@@ -1575,7 +1576,6 @@ gnunet_conversation_gtk_call_button_clicked_cb (GtkButton *button,
 
   arg = gtk_entry_get_text (address_entry);
   caller_id = GCG_EGOS_get_selected_ego ();
-  zone_id = GCG_ZONES_get_selected_zone ();
   if ( (NULL == caller_id) ||
        (NULL != active_out) ||
        (NULL != active_in) )
@@ -1593,10 +1593,11 @@ gnunet_conversation_gtk_call_button_clicked_cb (GtkButton *button,
   oc->call =
     GNUNET_CONVERSATION_call_start (GCG_get_configuration (),
                                     caller_id,
-                                    zone_id,
                                     arg,
-                                    speaker, mic,
-                                    &call_event_handler, oc);
+                                    speaker,
+                                    mic,
+                                    &call_event_handler,
+                                    oc);
   if (NULL == oc->call)
   {
     GCG_HISTORY_add (GCG_HISTORY_TYPE_FAILED,