5 files changed, 35 insertions, 35 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index da308fd1..5ae8d6de 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -55,16 +55,16 @@ pkgdata_DATA = \
   gnunet_namestore_gtk_main_window.glade \
   gnunet_namestore_gtk_qr_save_as_dialog.glade \
   gnunet_namestore_edit_a.glade \
-  gnunet_namestore_edit_ns.glade \
+  gnunet_namestore_edit_aaaa.glade \
   gnunet_namestore_edit_cname.glade \
-  gnunet_namestore_edit_soa.glade \
-  gnunet_namestore_edit_ptr.glade \
+  gnunet_namestore_edit_gns2dns.glade \
+  gnunet_namestore_edit_leho.glade \
   gnunet_namestore_edit_mx.glade \
-  gnunet_namestore_edit_txt.glade \
-  gnunet_namestore_edit_aaaa.glade \
   gnunet_namestore_edit_pkey.glade \
-  gnunet_namestore_edit_leho.glade \
+  gnunet_namestore_edit_ptr.glade \
+  gnunet_namestore_edit_soa.glade \
   gnunet_namestore_edit_srv.glade \
+  gnunet_namestore_edit_txt.glade \
   gnunet_namestore_edit_vpn.glade
 
 
diff --git a/contrib/gnunet_namestore_edit_ns.glade b/contrib/gnunet_namestore_edit_gns2dns.glade
index a817239a..47d3d388 100644
--- a/contrib/gnunet_namestore_edit_ns.glade
+++ b/contrib/gnunet_namestore_edit_gns2dns.glade
@@ -56,14 +56,14 @@
       </row>
     </data>
   </object>
-  <object class="GtkDialog" id="edit_ns_dialog">
+  <object class="GtkDialog" id="edit_gns2dns_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <signal name="response" handler="GNS_edit_ns_dialog_response_cb" swapped="no"/>
+    <signal name="response" handler="GNS_edit_gns2dns_dialog_response_cb" swapped="no"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="edit_dialog_vbox">
         <property name="visible">True</property>
@@ -217,23 +217,23 @@
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="edit_dialog_ns_frame">
+          <object class="GtkFrame" id="edit_dialog_gns2dns_frame">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="label_xalign">0</property>
             <property name="shadow_type">none</property>
             <child>
-              <object class="GtkAlignment" id="edit_dialog_ns_alignment">
+              <object class="GtkAlignment" id="edit_dialog_gns2dns_alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="top_padding">4</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkVBox" id="edit_dialog_ns_vbox">
+                  <object class="GtkVBox" id="edit_dialog_gns2dns_vbox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkEntry" id="edit_dialog_ns_entry">
+                      <object class="GtkEntry" id="edit_dialog_gns2dns_entry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="has_focus">True</property>
@@ -244,7 +244,7 @@
                         <property name="secondary_icon_activatable">False</property>
                         <property name="primary_icon_sensitive">True</property>
                         <property name="secondary_icon_sensitive">True</property>
-                        <signal name="changed" handler="GNS_edit_dialog_ns_entry_changed_cb" swapped="no"/>
+                        <signal name="changed" handler="GNS_edit_dialog_gns2dns_entry_changed_cb" swapped="no"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -257,7 +257,7 @@
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="edit_dialog_ns_label">
+              <object class="GtkLabel" id="edit_dialog_gns2dns_label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">&lt;b&gt;Name of the authoritative name server for the given name&lt;/b&gt;</property>
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index eb13501f..08d7bc20 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -1136,8 +1136,8 @@ launch_edit_dialog (gint n_type,
   case GNUNET_DNSPARSER_TYPE_MX:
     GNS_edit_dialog_mx (edc);
     break;
-  case GNUNET_DNSPARSER_TYPE_NS:
-    GNS_edit_dialog_ns (edc);
+  case GNUNET_NAMESTORE_TYPE_GNS2DNS:
+    GNS_edit_dialog_gns2dns (edc);
     break;
   case GNUNET_DNSPARSER_TYPE_SOA:
     GNS_edit_dialog_soa (edc);
diff --git a/src/namestore/gnunet-namestore-gtk_edit.c b/src/namestore/gnunet-namestore-gtk_edit.c
index 62972108..e9c32ec2 100644
--- a/src/namestore/gnunet-namestore-gtk_edit.c
+++ b/src/namestore/gnunet-namestore-gtk_edit.c
@@ -999,22 +999,22 @@ GNS_edit_dialog_mx (struct EditDialogContext *edc)
 }
 
 
-/* ************************ NS records *********************** */
+/* ************************ GNS2DNS records *********************** */
 
 /**
- * Check validity of the value in the edit dialog for NS-records.
+ * Check validity of the value in the edit dialog for GNS2DNS-records.
  * Then call the shared validity check if the result is OK.
  *
  * @param edc edit dialog context
  */
 static void
-edit_dialog_ns_validity_check (struct EditDialogContext *edc)
+edit_dialog_gns2dns_validity_check (struct EditDialogContext *edc)
 {
   GtkEditable *entry;
   const gchar *preedit;
 
   entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
-                                                "edit_dialog_ns_entry")),
+                                                "edit_dialog_gns2dns_entry")),
   preedit = gtk_editable_get_chars (entry, 0, -1);
   if ( (NULL == preedit) ||
        (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
@@ -1035,9 +1035,9 @@ edit_dialog_ns_validity_check (struct EditDialogContext *edc)
  * @param user_data the 'struct EditDialogContext'
  */
 void
-GNS_edit_ns_dialog_response_cb (GtkDialog *dialog,
-                                gint response_id,
-                                gpointer user_data)
+GNS_edit_gns2dns_dialog_response_cb (GtkDialog *dialog,
+                                     gint response_id,
+                                     gpointer user_data)
 {
   struct EditDialogContext *edc = user_data;
   GtkEntry *entry;
@@ -1047,7 +1047,7 @@ GNS_edit_ns_dialog_response_cb (GtkDialog *dialog,
   {
     edit_dialog_putes_common_elements (edc);
     entry = GTK_ENTRY (gtk_builder_get_object (edc->builder,
-                                               "edit_dialog_ns_entry"));
+                                               "edit_dialog_gns2dns_entry"));
     value = gtk_entry_get_text (entry);
     g_free (edc->n_value);
     edc->n_value = g_strdup (value);
@@ -1060,31 +1060,31 @@ GNS_edit_ns_dialog_response_cb (GtkDialog *dialog,
 
 
 /**
- * The user has edited the NS record value.  Enable/disable 'save'
+ * The user has edited the GNS2DNS record value.  Enable/disable 'save'
  * button depending on the validity of the value.
  *
  * @param entry editing widget
  * @param user_data the 'struct EditDialogContext' of the dialog
  */
 void
-GNS_edit_dialog_ns_entry_changed_cb (GtkEditable *entry,
-                                     gpointer user_data)
+GNS_edit_dialog_gns2dns_entry_changed_cb (GtkEditable *entry,
+                                          gpointer user_data)
 {
   struct EditDialogContext *edc = user_data;
 
-  edit_dialog_ns_validity_check (edc);
+  edit_dialog_gns2dns_validity_check (edc);
 }
 
 
 /**
- * Run an GNS Edit dialog for an 'NS' Record.
+ * Run an GNS Edit dialog for a 'GNS2DNS' Record.
  *
  * @param edc editing context to use
  */
 void
-GNS_edit_dialog_ns (struct EditDialogContext *edc)
+GNS_edit_dialog_gns2dns (struct EditDialogContext *edc)
 {
-  edc->builder = GNUNET_GTK_get_new_builder ("gnunet_namestore_edit_ns.glade",
+  edc->builder = GNUNET_GTK_get_new_builder ("gnunet_namestore_edit_gns2dns.glade",
                                              edc);
   if (NULL == edc->builder)
   {
@@ -1097,12 +1097,12 @@ GNS_edit_dialog_ns (struct EditDialogContext *edc)
   {
     /* set NS record */
     gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
-                                                           "edit_dialog_ns_entry")),
+                                                           "edit_dialog_gns2dns_entry")),
                         edc->n_value);
   }
-  edc->validator = &edit_dialog_ns_validity_check;
+  edc->validator = &edit_dialog_gns2dns_validity_check;
   edc->dialog = GTK_DIALOG (gtk_builder_get_object (edc->builder,
-                                                    "edit_ns_dialog"));
+                                                    "edit_gns2dns_dialog"));
   run_edit_dialog (edc);
 }
 
diff --git a/src/namestore/gnunet-namestore-gtk_edit.h b/src/namestore/gnunet-namestore-gtk_edit.h
index bcd53a3f..17183350 100644
--- a/src/namestore/gnunet-namestore-gtk_edit.h
+++ b/src/namestore/gnunet-namestore-gtk_edit.h
@@ -193,7 +193,7 @@ GNS_edit_dialog_mx (struct EditDialogContext *edc);
  * @param edc editing context to use
  */
 void
-GNS_edit_dialog_ns (struct EditDialogContext *edc);
+GNS_edit_dialog_gns2dns (struct EditDialogContext *edc);
 
 
 /**