15 files changed, 441 insertions, 90 deletions

diff --git a/src/namestore/gnunet-namestore-gtk_edit.c b/src/namestore/gnunet-namestore-gtk_edit.c
index ebe42915..7fe0d27b 100644
--- a/src/namestore/gnunet-namestore-gtk_edit.c
+++ b/src/namestore/gnunet-namestore-gtk_edit.c
@@ -1121,7 +1121,7 @@ edit_dialog_phone_validity_check (struct EditDialogContext *edc)
   struct GNUNET_CRYPTO_EcdsaPublicKey pub;
 
   entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
-                                                "edit_dialog_phone_peer_entry")),
+                                                "edit_dialog_phone_peer_entry"));
   preedit = gtk_editable_get_chars (entry, 0, -1);
   if ( (NULL == preedit) ||
        (GNUNET_OK !=
diff --git a/src/namestore/plugin_gtk_namestore_a.c b/src/namestore/plugin_gtk_namestore_a.c
index 319e7b0b..d72373e9 100644
--- a/src/namestore/plugin_gtk_namestore_a.c
+++ b/src/namestore/plugin_gtk_namestore_a.c
@@ -28,11 +28,28 @@
 
 
 /**
+ * The user has edited the A record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_a_entry_changed_cb (GtkEditable *entry,
+                                    gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
+/**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -54,7 +71,7 @@ a_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -79,7 +96,7 @@ a_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -110,7 +127,7 @@ a_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_a_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
@@ -131,7 +148,7 @@ libgnunet_plugin_gtk_namestore_a_init (void *cls)
  * @return always NULL
  */
 void *
-libgnunet_plugin_gtk_namestore_aaaa_done (void *cls)
+libgnunet_plugin_gtk_namestore_a_done (void *cls)
 {
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin = cls;
 
diff --git a/src/namestore/plugin_gtk_namestore_aaaa.c b/src/namestore/plugin_gtk_namestore_aaaa.c
index d32fcc6b..08da0bec 100644
--- a/src/namestore/plugin_gtk_namestore_aaaa.c
+++ b/src/namestore/plugin_gtk_namestore_aaaa.c
@@ -28,11 +28,28 @@
 
 
 /**
+ * The user has edited the AAAA record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_aaaa_entry_changed_cb (GtkEditable *entry,
+                                       gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
+/**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -49,7 +66,7 @@ aaaa_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +74,13 @@ static gchar *
 aaaa_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  const gchar *value;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_aaaa_entry"));
+  value = gtk_entry_get_text (entry);
+  return g_strdup (value);
 }
 
 
@@ -69,7 +91,7 @@ aaaa_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +99,16 @@ static int
 aaaa_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+  struct in6_addr v6;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_aaaa_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (1 != inet_pton (AF_INET6, preedit, &v6)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +122,7 @@ aaaa_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_aaaa_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_cname.c b/src/namestore/plugin_gtk_namestore_cname.c
index 581c740c..e9f2c119 100644
--- a/src/namestore/plugin_gtk_namestore_cname.c
+++ b/src/namestore/plugin_gtk_namestore_cname.c
@@ -28,11 +28,28 @@
 
 
 /**
+ * The user has edited the CNAME record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_cname_entry_changed_cb (GtkEditable *entry,
+                                       gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
+/**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -41,7 +58,12 @@ cname_load (void *cls,
         gchar *n_value,
         GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEntry *entry;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_cname_entry"));
+  gtk_entry_set_text (entry,
+                      n_value);
 }
 
 
@@ -49,7 +71,7 @@ cname_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +79,13 @@ static gchar *
 cname_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  const gchar *value;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_cname_entry"));
+  value = gtk_entry_get_text (entry);
+  return g_strdup (value);
 }
 
 
@@ -69,7 +96,7 @@ cname_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +104,15 @@ static int
 cname_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_cname_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +126,7 @@ cname_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_cname_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_gns2dns.c b/src/namestore/plugin_gtk_namestore_gns2dns.c
index 76879194..88d41ba9 100644
--- a/src/namestore/plugin_gtk_namestore_gns2dns.c
+++ b/src/namestore/plugin_gtk_namestore_gns2dns.c
@@ -27,12 +27,30 @@
 #include "gnunet_gtk_namestore_plugin.h"
 
 
+
+/**
+ * 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 plugin environment
+ */
+void
+GNS_edit_dialog_gns2dns_entry_changed_cb (GtkEditable *entry,
+                                          gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
 /**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -41,7 +59,9 @@ gns2dns_load (void *cls,
         gchar *n_value,
         GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                         "edit_dialog_gns2dns_entry")),
+                      n_value);
 }
 
 
@@ -49,7 +69,7 @@ gns2dns_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +77,13 @@ static gchar *
 gns2dns_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  const gchar *value;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_gns2dns_entry"));
+  value = gtk_entry_get_text (entry);
+  return g_strdup (value);
 }
 
 
@@ -69,7 +94,7 @@ gns2dns_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +102,15 @@ static int
 gns2dns_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_gns2dns_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +124,7 @@ gns2dns_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_gns2dns_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_leho.c b/src/namestore/plugin_gtk_namestore_leho.c
index abf33f6d..9187c4fd 100644
--- a/src/namestore/plugin_gtk_namestore_leho.c
+++ b/src/namestore/plugin_gtk_namestore_leho.c
@@ -27,12 +27,31 @@
 #include "gnunet_gtk_namestore_plugin.h"
 
 
+
+
+/**
+ * The user has edited the LEHO record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_leho_entry_changed_cb (GtkEditable *entry,
+                                       gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
 /**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -41,7 +60,12 @@ leho_load (void *cls,
         gchar *n_value,
         GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEntry *entry;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_leho_entry"));
+  gtk_entry_set_text (entry,
+                      n_value);
 }
 
 
@@ -49,7 +73,7 @@ leho_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +81,13 @@ static gchar *
 leho_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  const gchar *value;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_leho_entry"));
+  value = gtk_entry_get_text (entry);
+  return g_strdup (value);
 }
 
 
@@ -69,7 +98,7 @@ leho_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +106,15 @@ static int
 leho_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_leho_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +128,7 @@ leho_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_leho_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_mx.c b/src/namestore/plugin_gtk_namestore_mx.c
index 6a61a095..34b9df71 100644
--- a/src/namestore/plugin_gtk_namestore_mx.c
+++ b/src/namestore/plugin_gtk_namestore_mx.c
@@ -28,11 +28,28 @@
 
 
 /**
+ * The user has edited the MX record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_mx_entry_changed_cb (GtkEditable *entry,
+                                       gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
+/**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -41,7 +58,27 @@ mx_load (void *cls,
         gchar *n_value,
         GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  uint16_t mx_pref;
+  char result[253 + 1];
+
+  if (2 != SSCANF (n_value,
+                   "%hu,%253s",
+                   &mx_pref, result))
+  {
+    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Unable to parse MX record `%s'\n"),
+                n_value);
+    return;
+  }
+  gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                         "edit_dialog_mx_entry")),
+                      result);
+  gtk_spin_button_set_value
+    (GTK_SPIN_BUTTON
+     (gtk_builder_get_object (builder,
+                              "edit_dialog_mx_distance_spinbutton")),
+     mx_pref);
 }
 
 
@@ -49,7 +86,7 @@ mx_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +94,26 @@ static gchar *
 mx_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  const gchar *value;
+  char *result;
+  unsigned int distance;
+  gchar *ret;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_mx_entry"));
+  value = gtk_entry_get_text (entry);
+  distance = gtk_spin_button_get_value
+    (GTK_SPIN_BUTTON
+     (gtk_builder_get_object (builder,
+                              "edit_dialog_mx_distance_spinbutton")));
+  GNUNET_asprintf (&result,
+                   "%hu,%s",
+                   distance,
+                   value);
+  ret = g_strdup (result);
+  GNUNET_free (result);
+  return ret;
 }
 
 
@@ -69,7 +124,7 @@ mx_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +132,15 @@ static int
 mx_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_mx_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +154,7 @@ mx_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_mx_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
@@ -112,7 +175,7 @@ libgnunet_plugin_gtk_namestore_mx_init (void *cls)
  * @return always NULL
  */
 void *
-libgnunet_plugin_gtk_namestore_aaaa_done (void *cls)
+libgnunet_plugin_gtk_namestore_mx_done (void *cls)
 {
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin = cls;
 
diff --git a/src/namestore/plugin_gtk_namestore_phone.c b/src/namestore/plugin_gtk_namestore_phone.c
index 29815538..33defbf7 100644
--- a/src/namestore/plugin_gtk_namestore_phone.c
+++ b/src/namestore/plugin_gtk_namestore_phone.c
@@ -27,12 +27,31 @@
 #include "gnunet_gtk_namestore_plugin.h"
 
 
+
+
+/**
+ * The user has edited the PHONE record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_phone_peer_entry_changed_cb (GtkEditable *entry,
+                                             gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
 /**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -41,7 +60,28 @@ phone_load (void *cls,
         gchar *n_value,
         GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  const char *minus;
+  unsigned int line;
+
+  if (1 != (sscanf (n_value,
+                    "%u-",
+                    &line)))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON
+                             (gtk_builder_get_object (builder,
+                                                      "edit_dialog_phone_line_spinbutton")),
+                             line);
+  if (NULL == (minus = strchr (n_value, '-')))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                         "edit_dialog_phone_peer_entry")),
+                      minus + 1);
 }
 
 
@@ -49,7 +89,7 @@ phone_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +97,23 @@ static gchar *
 phone_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  GtkSpinButton *spin;
+  const gchar *value;
+  unsigned int line;
+  char *ret;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_phone_peer_entry"));
+  value = gtk_entry_get_text (entry);
+  spin = GTK_SPIN_BUTTON (gtk_builder_get_object (builder,
+                                                  "edit_dialog_phone_line_spinbutton"));
+  line = gtk_spin_button_get_value (spin);
+  GNUNET_asprintf (&ret,
+                   "%u-%s",
+                   line,
+                   value);
+  return ret;
 }
 
 
@@ -69,7 +124,7 @@ phone_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +132,19 @@ static int
 phone_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+  struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_phone_peer_entry"));
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK !=
+        GNUNET_CRYPTO_ecdsa_public_key_from_string (preedit,
+                                                       strlen (preedit),
+                                                       &pub)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +158,7 @@ phone_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_phone_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_pkey.c b/src/namestore/plugin_gtk_namestore_pkey.c
index 8b9e5c0a..f7cdc3de 100644
--- a/src/namestore/plugin_gtk_namestore_pkey.c
+++ b/src/namestore/plugin_gtk_namestore_pkey.c
@@ -28,11 +28,28 @@
 
 
 /**
+ * The user has edited the PKEY record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_pkey_entry_changed_cb (GtkEditable *entry,
+                                       gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
+/**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -41,7 +58,9 @@ pkey_load (void *cls,
         gchar *n_value,
         GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                         "edit_dialog_pkey_entry")),
+                      n_value);
 }
 
 
@@ -49,7 +68,7 @@ pkey_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +76,13 @@ static gchar *
 pkey_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  const gchar *value;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_pkey_entry"));
+  value = gtk_entry_get_text (entry);
+  return g_strdup (value);
 }
 
 
@@ -69,7 +93,7 @@ pkey_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +101,19 @@ static int
 pkey_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+  struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_pkey_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK !=
+        GNUNET_CRYPTO_ecdsa_public_key_from_string (preedit,
+                                                  strlen (preedit),
+                                                  &pub)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +127,7 @@ pkey_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_pkey_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_ptr.c b/src/namestore/plugin_gtk_namestore_ptr.c
index ada87eef..adf89f23 100644
--- a/src/namestore/plugin_gtk_namestore_ptr.c
+++ b/src/namestore/plugin_gtk_namestore_ptr.c
@@ -28,11 +28,28 @@
 
 
 /**
+ * The user has edited the PTR record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param user_data the plugin environment
+ */
+void
+GNS_edit_dialog_ptr_entry_changed_cb (GtkEditable *entry,
+                                       gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = user_data;
+
+  env->check_validity (env->cls);
+}
+
+
+/**
  * Function that will be called to initialize the builder's
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -41,7 +58,9 @@ ptr_load (void *cls,
         gchar *n_value,
         GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (builder,
+                                                         "edit_dialog_ptr_entry")),
+                      n_value);
 }
 
 
@@ -49,7 +68,7 @@ ptr_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -57,8 +76,13 @@ static gchar *
 ptr_store (void *cls,
          GtkBuilder *builder)
 {
-  GNUNET_break (0);
-  return NULL;
+  GtkEntry *entry;
+  const gchar *value;
+
+  entry = GTK_ENTRY (gtk_builder_get_object (builder,
+                                             "edit_dialog_ptr_entry"));
+  value = gtk_entry_get_text (entry);
+  return g_strdup (value);
 }
 
 
@@ -69,7 +93,7 @@ ptr_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -77,7 +101,15 @@ static int
 ptr_validate (void *cls,
             GtkBuilder *builder)
 {
-  GNUNET_break (0);
+  GtkEditable *entry;
+  const gchar *preedit;
+
+  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
+                                                "edit_dialog_ptr_entry")),
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL == preedit) ||
+       (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
@@ -91,7 +123,7 @@ ptr_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_ptr_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_soa.c b/src/namestore/plugin_gtk_namestore_soa.c
index 920db7ba..20cc3920 100644
--- a/src/namestore/plugin_gtk_namestore_soa.c
+++ b/src/namestore/plugin_gtk_namestore_soa.c
@@ -32,7 +32,7 @@
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -49,7 +49,7 @@ soa_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -69,7 +69,7 @@ soa_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -91,7 +91,7 @@ soa_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_soa_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_srv.c b/src/namestore/plugin_gtk_namestore_srv.c
index ea70d21f..f545d263 100644
--- a/src/namestore/plugin_gtk_namestore_srv.c
+++ b/src/namestore/plugin_gtk_namestore_srv.c
@@ -32,7 +32,7 @@
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -49,7 +49,7 @@ srv_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -69,7 +69,7 @@ srv_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -91,7 +91,7 @@ srv_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_srv_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_template.c b/src/namestore/plugin_gtk_namestore_template.c
index e27d604b..1f477d09 100644
--- a/src/namestore/plugin_gtk_namestore_template.c
+++ b/src/namestore/plugin_gtk_namestore_template.c
@@ -32,7 +32,7 @@
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -49,7 +49,7 @@ a_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -69,7 +69,7 @@ a_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -91,7 +91,7 @@ a_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_a_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_txt.c b/src/namestore/plugin_gtk_namestore_txt.c
index b11ffacb..c8c84dd3 100644
--- a/src/namestore/plugin_gtk_namestore_txt.c
+++ b/src/namestore/plugin_gtk_namestore_txt.c
@@ -32,7 +32,7 @@
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -49,7 +49,7 @@ txt_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -69,7 +69,7 @@ txt_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -91,7 +91,7 @@ txt_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_txt_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);
diff --git a/src/namestore/plugin_gtk_namestore_vpn.c b/src/namestore/plugin_gtk_namestore_vpn.c
index d37dabd5..622c69e5 100644
--- a/src/namestore/plugin_gtk_namestore_vpn.c
+++ b/src/namestore/plugin_gtk_namestore_vpn.c
@@ -32,7 +32,7 @@
  * widgets from the existing record (if there is one).
  * The `n_value` is the existing value of the record as a string.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param n_value the record as a string
  * @param builder the edit dialog's builder
  */
@@ -49,7 +49,7 @@ vpn_load (void *cls,
  * Function that will be called to retrieve the final value of the
  * record (in string format) once the dialog is being closed.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return record value as a string, as specified in the dialog
  */
@@ -69,7 +69,7 @@ vpn_store (void *cls,
  * function should highlight fields with invalid inputs for the
  * user.
  *
- * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *`
+ * @param cls the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
  * @param builder the edit dialog's builder
  * @return #GNUNET_OK if there is a valid record value in the dialog
  */
@@ -91,7 +91,7 @@ vpn_validate (void *cls,
 void *
 libgnunet_plugin_gtk_namestore_vpn_init (void *cls)
 {
-  struct GNUNET_GTK_NAMESTORE_PluginEnvirionment *env = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
 
   plugin = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginFunctions);