fix obsolete tooltips, rename symbol to match latest gnunet.git API

18 files changed, 21 insertions, 21 deletions

diff --git a/contrib/gnunet_namestore_edit_a.glade b/contrib/gnunet_namestore_edit_a.glade
index 97505d13..49bb41be 100644
--- a/contrib/gnunet_namestore_edit_a.glade
+++ b/contrib/gnunet_namestore_edit_a.glade
@@ -264,7 +264,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_aaaa.glade b/contrib/gnunet_namestore_edit_aaaa.glade
index 39ba278f..9a20a0ab 100644
--- a/contrib/gnunet_namestore_edit_aaaa.glade
+++ b/contrib/gnunet_namestore_edit_aaaa.glade
@@ -264,7 +264,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_box.glade b/contrib/gnunet_namestore_edit_box.glade
index 5cd530d8..fcba3d44 100644
--- a/contrib/gnunet_namestore_edit_box.glade
+++ b/contrib/gnunet_namestore_edit_box.glade
@@ -906,7 +906,7 @@ For PGP, specify the key identifier.
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                                    <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
diff --git a/contrib/gnunet_namestore_edit_cert.glade b/contrib/gnunet_namestore_edit_cert.glade
index 0782a4dc..8a9ab2f5 100644
--- a/contrib/gnunet_namestore_edit_cert.glade
+++ b/contrib/gnunet_namestore_edit_cert.glade
@@ -408,7 +408,7 @@ For PGP, specify the key identifier.
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_cname.glade b/contrib/gnunet_namestore_edit_cname.glade
index 0fd44cd9..9d65b5e6 100644
--- a/contrib/gnunet_namestore_edit_cname.glade
+++ b/contrib/gnunet_namestore_edit_cname.glade
@@ -250,7 +250,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
diff --git a/contrib/gnunet_namestore_edit_gns2dns.glade b/contrib/gnunet_namestore_edit_gns2dns.glade
index f4ed1a8c..9fb9f89c 100644
--- a/contrib/gnunet_namestore_edit_gns2dns.glade
+++ b/contrib/gnunet_namestore_edit_gns2dns.glade
@@ -262,7 +262,7 @@ If you want to specify multiple IPv4 addresses, you should specify a GNS label i
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_leho.glade b/contrib/gnunet_namestore_edit_leho.glade
index cf67b7b5..f4ac3bdf 100644
--- a/contrib/gnunet_namestore_edit_leho.glade
+++ b/contrib/gnunet_namestore_edit_leho.glade
@@ -264,7 +264,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_mx.glade b/contrib/gnunet_namestore_edit_mx.glade
index 2a852fd2..8bb12e43 100644
--- a/contrib/gnunet_namestore_edit_mx.glade
+++ b/contrib/gnunet_namestore_edit_mx.glade
@@ -298,7 +298,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_phone.glade b/contrib/gnunet_namestore_edit_phone.glade
index b7c9ffd9..860cf0a2 100644
--- a/contrib/gnunet_namestore_edit_phone.glade
+++ b/contrib/gnunet_namestore_edit_phone.glade
@@ -313,7 +313,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_pkey.glade b/contrib/gnunet_namestore_edit_pkey.glade
index cb1b5f46..e1bc42c0 100644
--- a/contrib/gnunet_namestore_edit_pkey.glade
+++ b/contrib/gnunet_namestore_edit_pkey.glade
@@ -264,7 +264,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_ptr.glade b/contrib/gnunet_namestore_edit_ptr.glade
index 47093336..7ddabd51 100644
--- a/contrib/gnunet_namestore_edit_ptr.glade
+++ b/contrib/gnunet_namestore_edit_ptr.glade
@@ -264,7 +264,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_soa.glade b/contrib/gnunet_namestore_edit_soa.glade
index d3c7fe92..fc4f9395 100644
--- a/contrib/gnunet_namestore_edit_soa.glade
+++ b/contrib/gnunet_namestore_edit_soa.glade
@@ -489,7 +489,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_srv.glade b/contrib/gnunet_namestore_edit_srv.glade
index c11f8aef..2c9dd260 100644
--- a/contrib/gnunet_namestore_edit_srv.glade
+++ b/contrib/gnunet_namestore_edit_srv.glade
@@ -428,7 +428,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                                    <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
diff --git a/contrib/gnunet_namestore_edit_tlsa.glade b/contrib/gnunet_namestore_edit_tlsa.glade
index 6c2fa7a1..4385a38b 100644
--- a/contrib/gnunet_namestore_edit_tlsa.glade
+++ b/contrib/gnunet_namestore_edit_tlsa.glade
@@ -682,7 +682,7 @@ For PGP, specify the key identifier (not implemented).
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                                    <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                                     <property name="xalign">0</property>
                                     <property name="draw_indicator">True</property>
                                   </object>
diff --git a/contrib/gnunet_namestore_edit_txt.glade b/contrib/gnunet_namestore_edit_txt.glade
index 70a4938b..027becd6 100644
--- a/contrib/gnunet_namestore_edit_txt.glade
+++ b/contrib/gnunet_namestore_edit_txt.glade
@@ -263,7 +263,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/contrib/gnunet_namestore_edit_vpn.glade b/contrib/gnunet_namestore_edit_vpn.glade
index 6bec787a..86ec00ec 100644
--- a/contrib/gnunet_namestore_edit_vpn.glade
+++ b/contrib/gnunet_namestore_edit_vpn.glade
@@ -364,7 +364,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Not that while it is recommended that 'private' records should be in the 'private zone', you are allowed to mark records in other zones as private as well.  Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
+                        <property name="tooltip_text" translatable="yes">Please be aware that once a record is made public, you are less free to change expiration times.  Most importantly, if your record is set to never expire, you will never be able to change the mapping in the future if the record is public.</property>
                         <property name="xalign">0.5</property>
                         <property name="draw_indicator">True</property>
                       </object>
diff --git a/src/fs/gnunet-fs-gtk_main-window-search.c b/src/fs/gnunet-fs-gtk_main-window-search.c
index 10fcf93d..1a869fdd 100644
--- a/src/fs/gnunet-fs-gtk_main-window-search.c
+++ b/src/fs/gnunet-fs-gtk_main-window-search.c
@@ -690,7 +690,7 @@ GNUNET_FS_GTK_save_button_clicked_cb (GtkButton * button,
     /* show the window */
     gtk_window_present (GTK_WINDOW (lctx->progress_dialog));
     lctx->lr = GNUNET_GNS_lookup (main_ctx->gns,
-                                  GNUNET_GNS_MASTERZONE_STR,
+                                  GNUNET_GNS_EMPTY_LABEL_AT,
                                   &pkey,
                                   GNUNET_GNSRECORD_TYPE_NICK,
                                   GNUNET_NO,
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index b5dca553..a119b5de 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -1268,7 +1268,7 @@ check_validity (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
        ( (GNUNET_SYSERR ==
           GNUNET_DNSPARSER_check_label (name)) &&
          (0 != strcmp (name,
-                       GNUNET_GNS_MASTERZONE_STR))) )
+                       GNUNET_GNS_EMPTY_LABEL_AT))) )
   {
     edit_dialog_disable_save (edc);
     return;
@@ -2400,7 +2400,7 @@ zone_iteration_proc (void *cls,
   GtkTreePath *sel_path;
 
   if ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name)) &&
-       (0 != strcmp (name, GNUNET_GNS_MASTERZONE_STR)) )
+       (0 != strcmp (name, GNUNET_GNS_EMPTY_LABEL_AT)) )
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -2537,7 +2537,7 @@ zone_iteration_proc (void *cls,
                        "%s",
                        EXPIRE_INVALID_STRING);
     if ( (0 == strcmp (name,
-                       GNUNET_GNS_MASTERZONE_STR)) &&
+                       GNUNET_GNS_EMPTY_LABEL_AT)) &&
          (GNUNET_GNSRECORD_TYPE_NICK == rd[c].record_type) &&
          (NULL == current_pseudonym) )
     {
@@ -2875,7 +2875,7 @@ update_nick_record (const char *new_name)
                                  oc);
     oc->qe = GNUNET_NAMESTORE_records_store (namestore,
                                              pkey,
-                                             GNUNET_GNS_MASTERZONE_STR,
+                                             GNUNET_GNS_EMPTY_LABEL_AT,
                                              total,
                                              rd_new,
                                              &operation_done_cont,