7 files changed, 10 insertions, 10 deletions

diff --git a/contrib/gnunet_setup_gns_edit_pkey.glade b/contrib/gnunet_setup_gns_edit_pkey.glade
index a260face..c736a500 100644
--- a/contrib/gnunet_setup_gns_edit_pkey.glade
+++ b/contrib/gnunet_setup_gns_edit_pkey.glade
@@ -237,7 +237,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="has_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Enter the hash of the public key of the authority here.</property>
+                        <property name="tooltip_text" translatable="yes">Enter the public key of the authority here.</property>
                         <property name="max_length">105</property>
                         <property name="invisible_char">●</property>
                         <property name="primary_icon_activatable">False</property>
@@ -260,7 +260,7 @@
               <object class="GtkLabel" id="edit_dialog_pkey_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;GADS authority for the subzone (PKEY)&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;GNS authority for the subzone (PKEY)&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>
diff --git a/contrib/gnunet_setup_gns_edit_vpn.glade b/contrib/gnunet_setup_gns_edit_vpn.glade
index 4411b8e8..aef35da1 100644
--- a/contrib/gnunet_setup_gns_edit_vpn.glade
+++ b/contrib/gnunet_setup_gns_edit_vpn.glade
@@ -362,7 +362,7 @@
               <object class="GtkLabel" id="edit_dialog_vpn_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;GNUnet VPN address (GADS only)&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;GNUnet VPN address (GNS only)&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>
diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index 589f8d36..d1d29bfb 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -4519,7 +4519,7 @@
                               <object class="GtkCellRendererCombo" id="GNUNET_setup_gns_type_cellrenderercombo">
                                 <property name="model">GNUNET_setup_gns_type_liststore</property>
                                 <property name="text_column">1</property>
-                                <signal name="changed" handler="GNUNET_setup_gns_type_cellrenderercombo_changed_cb" swapped="no"/>
+                                <signal name="edited" handler="GNUNET_setup_gns_type_cellrenderercombo_edited_cb" swapped="no"/>
                               </object>
                               <attributes>
                                 <attribute name="visible">10</attribute>
diff --git a/src/setup/gnunet-setup-gns-edit.c b/src/setup/gnunet-setup-gns-edit.c
index 362b1ce0..7bfed4db 100644
--- a/src/setup/gnunet-setup-gns-edit.c
+++ b/src/setup/gnunet-setup-gns-edit.c
@@ -1126,14 +1126,14 @@ edit_dialog_pkey_validity_check (struct EditDialogContext *edc)
 {
   GtkEditable *entry;
   const gchar *preedit;
-  struct GNUNET_HashCode hc;
+  struct GNUNET_CRYPTO_EccPublicKey pub;
 
   entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
                                                 "edit_dialog_pkey_entry")),
   preedit = gtk_editable_get_chars (entry, 0, -1);
   if ( (NULL == preedit) ||
        (GNUNET_OK != 
-        GNUNET_CRYPTO_hash_from_string (preedit, &hc)) )
+        GNUNET_CRYPTO_ecc_public_key_from_string (preedit, &pub)) )
   {
     edit_dialog_disable_save (edc);
     return;
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 768054e1..1c37036a 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -1148,7 +1148,7 @@ check_permissions (struct RecordInfo *ri,
     show_error_message (_("Record combination not permitted"),
                         _("Given the existing records, adding a new record of this type is not allowed.\n"
                           "CNAME and PKEY records cannot co-exist with other records.\n"
-                          "NS records in GADS can only co-exist with A and AAAA records.\n"));
+                          "NS records in GNS can only co-exist with A and AAAA records.\n"));
     return GNUNET_NO;
   }
   return GNUNET_OK;
@@ -1296,7 +1296,7 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
        (0 != strcmp (new_text, GNUNET_GNS_MASTERZONE_STR)) )
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                _("Name `%s' invalid for GADS/DNS (too long for a DNS label?)\n"),
+                _("Name `%s' invalid for GNS/DNS (too long for a DNS label?)\n"),
                 new_text);
     gdk_beep ();
     return;
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 9cd2a19f..f376961e 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1966,7 +1966,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    NULL},
 
 
-  /* GADS/GNS */
+  /* GNS */
 
   {
    "GNUNET_setup_general_services_gns_checkbutton",
diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index e22155fd..1acd6237 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -125,7 +125,7 @@ help_click_callback (GtkWidget * widget, GdkEventButton * event,
 
 /**
  * The main visible page in our main notebook changed.  If the
- * GADS page is visible, hide the help text, otherwise show it.
+ * GNS page is visible, hide the help text, otherwise show it.
  */
 void
 GNUNET_setup_notebook_switch_page_cb (GtkNotebook *notebook,