1 files changed, 6 insertions, 10 deletions

diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index e25f6609..9b7115ad 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -26,6 +26,7 @@
 #include "gnunet_gtk.h"
 #include "gnunet-setup-gns.h"
 #include "gnunet-setup-gns-edit.h"
+#include <gnunet/gnunet_gns_service.h>
 #include <gnunet/gnunet_namestore_service.h>
 #include <gnunet/gnunet_dnsparser_lib.h>
 
@@ -42,11 +43,6 @@
 #define NEW_RECORD_STR gettext_noop ("<new record>")
 
 /**
- * Text we use for 'our own zone'.  FIXME: define as constant in GNS?
- */
-#define ROOT_STR "+"
-
-/**
  * Text we use for the expiration to mean 'never expires'.
  */
 #define EXPIRE_NEVER_STRING gettext_noop ("never")
@@ -828,7 +824,7 @@ check_name_validity_and_commit (GtkTreeIter *it,
     g_free (name);
     return;
   }
-  if ( (0 == strcmp (name, ROOT_STR)) &&
+  if ( (0 == strcmp (name, GNUNET_GNS_MASTERZONE_STR)) &&
        (0 == strcmp (current_zone_option, "ZONEKEY")) )
   {
     /* We have to append PSEU RECORD, this is the 'master' zone */
@@ -1082,7 +1078,7 @@ remove_records_by_path (const gchar *path)
     g_free (n_name);
     g_free (n_value);
   }
-  else if (0 != strcmp (name, ROOT_STR))
+  else if (0 != strcmp (name, GNUNET_GNS_MASTERZONE_STR))
   {
     /* Removing the whole name record */
     rc = GNUNET_malloc(sizeof (struct RemoveContext));
@@ -1401,7 +1397,7 @@ GNUNET_setup_gns_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
     return;
   if ( (GNUNET_OK !=
         GNUNET_DNSPARSER_check_label (new_text)) &&
-       (0 != strcmp (new_text, ROOT_STR)) )
+       (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"),
@@ -1944,7 +1940,7 @@ zone_iteration_proc (void *cls,
     return;
   }
   if ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name)) &&
-       (0 != strcmp (name, ROOT_STR)) )
+       (0 != strcmp (name, GNUNET_GNS_MASTERZONE_STR)) )
   {
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -2009,7 +2005,7 @@ zone_iteration_proc (void *cls,
     else
       GNUNET_asprintf (&type_str, "%s", EXPIRE_INVALID_STRING);
 
-    if ( (0 == strcmp (name, ROOT_STR)) && 
+    if ( (0 == strcmp (name, GNUNET_GNS_MASTERZONE_STR)) && 
          (GNUNET_NAMESTORE_TYPE_PSEU == rd[c].record_type) )
     {
       pseu_entry = GTK_ENTRY((GNUNET_SETUP_get_object ("GNUNET_setup_gns_pseu_entry")));