1 files changed, 48 insertions, 12 deletions

diff --git a/src/namestore/plugin_gtk_namestore_gns2dns.c b/src/namestore/plugin_gtk_namestore_gns2dns.c
index 16ac03fb..d5da783c 100644
--- a/src/namestore/plugin_gtk_namestore_gns2dns.c
+++ b/src/namestore/plugin_gtk_namestore_gns2dns.c
@@ -56,12 +56,31 @@ GNS_edit_dialog_gns2dns_entry_changed_cb (GtkEditable *entry,
  */
 static void
 gns2dns_load (void *cls,
-        gchar *n_value,
-        GtkBuilder *builder)
+              gchar *n_value,
+              GtkBuilder *builder)
 {
+  char *cpy;
+  char *at;
+
+  cpy = GNUNET_strdup (n_value);
+  at = strchr (cpy, '@');
+  if (NULL == at)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Unable to parse GNS2DNS record `%s'\n"),
+                n_value);
+    GNUNET_free (cpy);
+    return;
+  }
+  *at = '\0';
+  at++;
   gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder,
-                                                         "edit_dialog_gns2dns_entry")),
-                      n_value);
+                                                         "edit_dialog_gns2dns_ns_entry")),
+                      cpy);
+  gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                         "edit_dialog_gns2dns_ip_entry")),
+                      at);
+  GNUNET_free (cpy);
 }
 
 
@@ -75,15 +94,24 @@ gns2dns_load (void *cls,
  */
 static gchar *
 gns2dns_store (void *cls,
-         GtkBuilder *builder)
+               GtkBuilder *builder)
 {
   GtkEntry *entry;
-  const gchar *value;
+  const gchar *ns_value;
+  const gchar *ip_value;
+  char *ret;
 
   entry = GTK_ENTRY (gtk_builder_get_object (builder,
-                                             "edit_dialog_gns2dns_entry"));
-  value = gtk_entry_get_text (entry);
-  return g_strdup (value);
+                                             "edit_dialog_gns2dns_ns_entry"));
+  ns_value = gtk_entry_get_text (entry);
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_gns2dns_ip_entry"));
+  ip_value = gtk_entry_get_text (entry);
+  GNUNET_asprintf (&ret,
+                   "%s@%s",
+                   ns_value,
+                   ip_value);
+  return ret;
 }
 
 
@@ -100,13 +128,19 @@ gns2dns_store (void *cls,
  */
 static int
 gns2dns_validate (void *cls,
-            GtkBuilder *builder)
+                  GtkBuilder *builder)
 {
   GtkEditable *entry;
   const gchar *preedit;
 
   entry = GTK_EDITABLE (gtk_builder_get_object (builder,
-                                                "edit_dialog_gns2dns_entry")),
+                                                "edit_dialog_gns2dns_ns_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
+    return GNUNET_SYSERR;
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_gns2dns_ip_entry")),
   preedit = gtk_editable_get_chars (entry, 0, -1);
   if ( (NULL == preedit) ||
        (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
@@ -127,7 +161,9 @@ libgnunet_plugin_gtk_namestore_gns2dns_init (void *cls)
   struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
   static struct GNUNET_GTK_NAMESTORE_Symbol symbols[] = {
-    { "GNS_edit_dialog_gns2dns_entry_changed_cb",
+    { "GNS_edit_dialog_gns2dns_ip_entry_changed_cb",
+      G_CALLBACK (GNS_edit_dialog_gns2dns_entry_changed_cb) },
+    { "GNS_edit_dialog_gns2dns_ns_entry_changed_cb",
       G_CALLBACK (GNS_edit_dialog_gns2dns_entry_changed_cb) },
     { NULL, NULL }
   };