-finishing implementation of pluggable dialogs (#3081)

1 files changed, 524 insertions, 63 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index eb08557b..4483b0c2 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -24,7 +24,8 @@
  * @brief edit GNS zones
  */
 #include "gnunet_gtk.h"
-#include "gnunet-namestore-gtk_edit.h"
+#include "gnunet_gtk_namestore_plugin.h"
+#include <gmodule.h>
 #include <gnunet/gnunet_gnsrecord_lib.h>
 #include <gnunet/gnunet_gns_service.h>
 #include <gnunet/gnunet_identity_service.h>
@@ -183,6 +184,25 @@ enum LIST_COLUMNS
 
 
 /**
+ * Columns in the zone list store.
+ */
+enum ZONE_COLUMNS
+{
+
+  /**
+   * A gchararray
+   */
+  ZONE_LS_NAME = 0,
+
+
+  /**
+   * A `struct GNUNET_IDENTITY_Ego`
+   */
+  ZONE_LS_EGO = 1
+};
+
+
+/**
  * Closure for 'operation_done_cont'.
  */
 struct OperationContext
@@ -230,7 +250,7 @@ struct MoveOperationContext
   /**
    * Info from editing dialog.
    */
-  struct EditDialogContext *edc;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc;
 
   /**
    * Private key of target zone.
@@ -535,8 +555,8 @@ setup_qrcode ()
  */
 void
 gnunet_namestore_gtk_qr_save_as_dialog_response_cb (GtkDialog *dialog,
-                                            gint response_id,
-                                            gpointer user_data)
+                                                    gint response_id,
+                                                    gpointer user_data)
 {
 #if HAVE_QRENCODE_H
   GtkBuilder *builder = user_data;
@@ -577,7 +597,7 @@ gnunet_namestore_gtk_qr_save_as_dialog_response_cb (GtkDialog *dialog,
  */
 void
 gnunet_namestore_gtk_qr_saveas_button_clicked_cb (GtkButton *button,
-                                              gpointer user_data)
+                                                  gpointer user_data)
 {
   GtkBuilder *builder;
   GtkWindow *dialog;
@@ -589,7 +609,7 @@ gnunet_namestore_gtk_qr_saveas_button_clicked_cb (GtkButton *button,
   pseu = gtk_entry_get_text (GTK_ENTRY(entry));
   builder =
     GNUNET_GTK_get_new_builder ("gnunet_namestore_gtk_qr_save_as_dialog.glade",
-                                NULL);
+                                NULL);
   if (NULL == builder)
   {
     GNUNET_break (0);
@@ -782,7 +802,7 @@ show_error_message (const char *title,
  * @param edc resources to free
  */
 static void
-free_edit_dialog_context (struct EditDialogContext *edc)
+free_edit_dialog_context (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
 {
   g_free (edc->name);
   g_free (edc->n_value);
@@ -804,7 +824,7 @@ merge_with_existing_records (void *cls,
                              const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct MoveOperationContext *moc = cls;
-  struct EditDialogContext *edc = moc->edc;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = moc->edc;
   struct GNUNET_GNSRECORD_Data rd_new[rd_count + 1];
   struct OperationContext *oc;
 
@@ -883,7 +903,7 @@ handle_records_for_merge (void *cls,
  * @param ret return code of the dialog
  */
 static void
-edit_dialog_continuation (struct EditDialogContext *edc,
+edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
                           GtkResponseType ret)
 {
   struct RecordInfo *ri = edc->ri;
@@ -894,6 +914,17 @@ edit_dialog_continuation (struct EditDialogContext *edc,
   size_t data_size;
   struct OperationContext *oc;
 
+  if (NULL != edc->plugin)
+  {
+    GNUNET_PLUGIN_unload (edc->liblow,
+                          edc->plugin);
+    edc->plugin = NULL;
+  }
+  if (NULL != edc->liblow)
+  {
+    GNUNET_free (edc->liblow);
+    edc->liblow = NULL;
+  }
   if ( (NULL != ri) &&
        (GNUNET_OK !=
         GNUNET_GNSRECORD_records_deserialize (ri->data_size,
@@ -1044,6 +1075,440 @@ edit_dialog_continuation (struct EditDialogContext *edc,
 
 
 /**
+ * Disable 'save' button, dialog state is not acceptable.
+ *
+ * @param edc dialog to modify
+ */
+static void
+edit_dialog_disable_save (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
+{
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                                "edit_dialog_save_button")),
+                            FALSE);
+}
+
+
+/**
+ * Enable 'save' button, dialog state is acceptable.
+ *
+ * @param edc dialog to modify
+ */
+static void
+edit_dialog_enable_save (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
+{
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                                "edit_dialog_save_button")),
+                            TRUE);
+}
+
+
+/**
+ * Function that should be called by the plugin whenever values in
+ * the dialog were edited.  It will check the validity of the dialog
+ * and update the "save" button accordingly.
+ *
+ * @param edc the plugin environment
+ */
+static void
+check_validity (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
+{
+
+  GtkEditable *entry;
+  const gchar *name;
+
+  /* check name */
+  entry = GTK_EDITABLE (gtk_builder_get_object (edc->builder,
+                                                "edit_dialog_name_entry"));
+  name = gtk_editable_get_chars (entry, 0, -1);
+  if ( (GNUNET_OK != edc->plugin->validate (edc->plugin->cls,
+                                            edc->builder)) ||
+       ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name)) &&
+         (0 != strcmp (name, GNUNET_GNS_MASTERZONE_STR))) )
+  {
+    edit_dialog_disable_save (edc);
+    return;
+  }
+  edit_dialog_enable_save (edc);
+}
+
+
+/**
+ * Setup the zone combobox.
+ *
+ * @param edc dialog to setup the combo box for
+ */
+static void
+setup_zone (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
+{
+  GtkTreeIter iter;
+  GtkComboBox *cb;
+  gchar *name;
+
+  cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
+                                              "edit_dialog_zone_combobox"));
+
+  gtk_combo_box_set_model (cb,
+                           GTK_TREE_MODEL (edc->zone_liststore));
+  GNUNET_assert (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (edc->zone_liststore),
+                                                &iter));
+  do {
+    gtk_tree_model_get (GTK_TREE_MODEL (edc->zone_liststore),
+                        &iter,
+                        ZONE_LS_NAME, &name,
+                        -1);
+    if (0 == strcmp (name,
+                     edc->new_zone_option))
+    {
+      g_free (name);
+      break;
+    }
+    g_free (name);
+  } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (edc->zone_liststore),
+                                     &iter));
+  gtk_combo_box_set_active_iter (cb,
+                                 &iter);
+}
+
+
+/**
+ * Initialize widgets of the edit dialog that are the same regardless of
+ * the type of the record.
+ *
+ * @param edc dialog context
+ */
+static void
+edit_dialog_setup_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
+{
+  GtkComboBox *cb;
+  GtkListStore *ls;
+  GtkTreeIter iter;
+  struct GNUNET_TIME_Absolute at;
+  struct GNUNET_TIME_Relative rt;
+  time_t tp;
+  struct tm *ymd;
+  GtkCalendar *cal;
+
+  if (GNUNET_YES !=
+      edc->old_record_in_namestore)
+  {
+    gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_delete_button")));
+    edit_dialog_disable_save (edc);
+  }
+  gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_name_entry")),
+                      edc->name);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                           "edit_dialog_options_public_checkbutton")),
+                                edc->n_public);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                           "edit_dialog_options_shadow_checkbutton")),
+                                edc->n_is_shadow);
+  if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time)
+  {
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                             "edit_dialog_expiration_never_radiobutton")),
+                                  TRUE);
+    gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_expiration_absolute_calendar")));
+    gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_expiration_absolute_hbox")));
+    gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_expiration_relative_combobox")));
+  }
+  if ( (edc->n_is_relative) &&
+       (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us != edc->n_exp_time) )
+  {
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                             "edit_dialog_expiration_relative_radiobutton")),
+                                  TRUE);
+    gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_expiration_absolute_calendar")));
+    gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_expiration_absolute_hbox")));
+    rt.rel_value_us = edc->n_exp_time;
+  }
+  else
+  {
+    /* select a sane default */
+    rt = GNUNET_TIME_UNIT_DAYS;
+  }
+  cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
+                                              "edit_dialog_expiration_relative_combobox"));
+  ls = GTK_LIST_STORE (gtk_combo_box_get_model (cb));
+  gtk_list_store_insert_with_values (ls, &iter,
+                                     -1 /* position: append */,
+                                     0, GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_NO),
+                                     -1);
+  gtk_combo_box_set_active_iter (cb, &iter);
+  if ( (! edc->n_is_relative) &&
+       (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us != edc->n_exp_time) )
+  {
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                             "edit_dialog_expiration_absolute_radiobutton")),
+                                  TRUE);
+
+    gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                         "edit_dialog_expiration_relative_combobox")));
+    at.abs_value_us = edc->n_exp_time;
+  }
+  else
+  {
+    /* select a sane default: right now */
+    at = GNUNET_TIME_absolute_get ();
+  }
+  tp = (time_t) (at.abs_value_us / 1000000LL); /* convert to seconds */
+  ymd = gmtime (&tp);
+  cal = GTK_CALENDAR (gtk_builder_get_object (edc->builder,
+                                              "edit_dialog_expiration_absolute_calendar"));
+  gtk_calendar_select_month (cal,
+                             ymd->tm_mon,
+                             ymd->tm_year + 1900);
+  gtk_calendar_mark_day (cal,
+                         ymd->tm_mday);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                      "edit_dialog_expiration_absolute_hours_spinbutton")),
+                             (double) ymd->tm_hour);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                      "edit_dialog_expiration_absolute_minutes_spinbutton")),
+                             (double) ymd->tm_min);
+  gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                      "edit_dialog_expiration_absolute_seconds_spinbutton")),
+                             (double) ymd->tm_sec);
+}
+
+
+/**
+ * Perform the reverse of the #edit_dialog_setup_common_elements() function,
+ * that is, extract the values from the (common) widgets and store the
+ * values in @a edc.
+ *
+ * @param edc edit dialog to extract data from
+ */
+static void
+edit_dialog_putes_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc)
+{
+  const char *rt_s;
+  struct GNUNET_TIME_Relative rt;
+  GtkComboBox *cb;
+  GtkTreeModel *tm;
+  GtkTreeIter iter;
+  gchar *opt;
+  struct GNUNET_IDENTITY_Ego *ego;
+
+  /* is public flag */
+  edc->n_public = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                                           "edit_dialog_options_public_checkbutton")));
+  /* is shadow flag */
+  edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                                              "edit_dialog_options_shadow_checkbutton")));
+
+  /* 'forever' expiration time */
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                               "edit_dialog_expiration_never_radiobutton"))))
+  {
+    edc->n_exp_time = GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us;
+    edc->n_is_relative = TRUE; /* doesn't matter, but make sure it is well-defined anyway */
+  }
+
+  /* 'relative' expiration time */
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                               "edit_dialog_expiration_relative_radiobutton"))))
+  {
+    cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
+                                                "edit_dialog_expiration_relative_combobox"));
+    tm = gtk_combo_box_get_model (cb);
+    if (! gtk_combo_box_get_active_iter (cb, &iter))
+    {
+      GNUNET_break (0);
+      return;
+    }
+    gtk_tree_model_get (tm, &iter,
+                        0, &rt_s,
+                        -1);
+    GNUNET_break (GNUNET_YES ==
+                  GNUNET_STRINGS_fancy_time_to_relative (rt_s,
+                                                         &rt));
+    edc->n_exp_time = rt.rel_value_us;
+    edc->n_is_relative = TRUE;
+  }
+
+  /* 'absolute' expiration time */
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                               "edit_dialog_expiration_absolute_radiobutton"))))
+  {
+    guint year;
+    guint month;
+    guint day;
+    guint hour;
+    guint minute;
+    guint second;
+    char fancydate[128];
+    struct GNUNET_TIME_Absolute atime;
+
+    gtk_calendar_get_date (GTK_CALENDAR (gtk_builder_get_object (edc->builder,
+                                                                 "edit_dialog_expiration_absolute_calendar")),
+                           &year, &month, &day);
+    hour = gtk_spin_button_get_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                               "edit_dialog_expiration_absolute_hours_spinbutton")));
+    minute = gtk_spin_button_get_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                          "edit_dialog_expiration_absolute_minutes_spinbutton")));
+    second = gtk_spin_button_get_value (GTK_SPIN_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                                 "edit_dialog_expiration_absolute_seconds_spinbutton")));
+    GNUNET_snprintf (fancydate,
+                     sizeof (fancydate),
+                     "%u-%u-%u %u:%u:%u",
+                     (unsigned int) year,
+                     (unsigned int) month + 1,
+                     (unsigned int) day,
+                     (unsigned int) hour,
+                     (unsigned int) minute,
+                     (unsigned int) second);
+    GNUNET_break (GNUNET_OK ==
+                  GNUNET_STRINGS_fancy_time_to_absolute (fancydate,
+                                                         &atime));
+    edc->n_exp_time = atime.abs_value_us;
+    edc->n_is_relative = FALSE;
+  }
+
+  /* extract target zone! */
+  cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
+                                              "edit_dialog_zone_combobox"));
+  tm = gtk_combo_box_get_model (cb);
+  if (! gtk_combo_box_get_active_iter (cb, &iter))
+  {
+    GNUNET_break (0);
+  }
+  else
+  {
+    gtk_tree_model_get (tm, &iter,
+                        ZONE_LS_NAME, &opt,
+                        ZONE_LS_EGO, &ego,
+                        -1);
+    if (NULL == opt)
+    {
+      GNUNET_break (0);
+    }
+    else
+    {
+      g_free (edc->new_zone_option);
+      edc->new_zone_option = g_strdup (opt);
+      g_free (opt);
+      edc->ego = ego;
+    }
+  }
+}
+
+
+/**
+ * Editing dialog was closed, get the data and call the
+ * continuation.
+ *
+ * @param dialog editing dialog
+ * @param response_id action that caused the dialog to be closed
+ * @param user_data the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment`
+ */
+static void
+edit_dialog_response_cb (GtkDialog *dialog,
+                         gint response_id,
+                         gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+
+  if (GTK_RESPONSE_OK == response_id)
+  {
+    edit_dialog_putes_common_elements (edc);
+    g_free (edc->n_value);
+    edc->n_value = edc->plugin->store (edc->plugin->cls,
+                                       edc->builder);
+  }
+  gtk_widget_destroy (GTK_WIDGET (edc->dialog));
+  g_object_unref (edc->builder);
+  edc->builder = NULL;
+  edit_dialog_continuation (edc, response_id);
+}
+
+
+/**
+ * Callback invoked from #GNUNET_GTK_get_new_builder2 to give
+ * us a chance to add symbols from the plugin.
+ *
+ * @param builder the builder under construction
+ * @param object object to bind signal to
+ * @param signal_name name of the signal
+ * @param handler_name name of the handler
+ * @param connect_object a GObject, if non-NULL, use g_signal_connect_object()
+ * @param flags GConnectFlags to use
+ * @param user_data the `struct GNUNET_GTK_NAMESTORE_PluginEnvironment *`
+ */
+static void
+add_symbols (GtkBuilder *builder,
+             GObject *object,
+             const gchar *signal_name,
+             const gchar *handler_name,
+             GObject *connect_object,
+             GConnectFlags flags,
+             gpointer user_data)
+
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+  unsigned int i;
+  GCallback cb;
+  GModule *m;
+
+  cb = NULL;
+  if (NULL != edc->plugin->symbols)
+  {
+    for (i=0; NULL != edc->plugin->symbols[i].name; i++)
+    {
+      if (0 == strcmp (handler_name,
+                       edc->plugin->symbols[i].name))
+      {
+        cb = edc->plugin->symbols[i].cb;
+        break;
+      }
+    }
+  }
+  if (NULL == cb)
+  {
+    m = g_module_open (NULL, 0);
+    if (! g_module_symbol (m,
+                           handler_name,
+                           (void **) &cb))
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  _("Failed to find handler `%s'\n"),
+                  handler_name);
+      g_module_close (m);
+      return;
+    }
+    g_module_close (m);
+  }
+  if (NULL != connect_object)
+    g_signal_connect_object (object,
+                             signal_name,
+                             cb,
+                             connect_object,
+                             flags);
+  else if (flags & G_CONNECT_SWAPPED)
+    g_signal_connect_swapped (object,
+                              signal_name,
+                              cb,
+                              user_data);
+  else if (flags & G_CONNECT_AFTER)
+    g_signal_connect_after (object,
+                            signal_name,
+                            cb,
+                            user_data);
+  else
+    g_signal_connect (object,
+                      signal_name,
+                      cb,
+                      user_data);
+}
+
+
+/**
  * Launch a record editing dialog.
  *
  * @param n_type type of the record to edit
@@ -1059,9 +1524,9 @@ launch_edit_dialog (gint n_type,
                     struct RecordInfo *ri,
                     unsigned int off)
 {
-  struct EditDialogContext *edc;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc;
 
-  edc = GNUNET_new (struct EditDialogContext);
+  edc = GNUNET_new (struct GNUNET_GTK_NAMESTORE_PluginEnvironment);
   if ( (NULL != ri) &&
        (off < ri->rd_count) )
   {
@@ -1090,56 +1555,52 @@ launch_edit_dialog (gint n_type,
   edc->name = GNUNET_strdup (name);
   edc->new_zone_option = g_strdup (current_zone_option);
   edc->record_type = n_type;
-  edc->cont = &edit_dialog_continuation;
   edc->zone_liststore = zone_liststore;
-  switch (n_type)
+  edc->check_validity = &check_validity;
+  GNUNET_asprintf (&edc->liblow,
+                   "libgnunet_plugin_gtk_namestore_%s",
+                   GNUNET_GNSRECORD_number_to_typename (n_type));
+  GNUNET_STRINGS_utf8_tolower (edc->liblow,
+                               edc->liblow);
+   edc->plugin = GNUNET_PLUGIN_load (edc->liblow, edc);
+  if (NULL == edc->plugin)
   {
-  case GNUNET_DNSPARSER_TYPE_A:
-    GNS_edit_dialog_a (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_AAAA:
-    GNS_edit_dialog_aaaa (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_CNAME:
-    GNS_edit_dialog_cname (edc);
-    break;
-  case GNUNET_GNSRECORD_TYPE_LEHO:
-    GNS_edit_dialog_leho (edc);
-    break;
-  case GNUNET_GNSRECORD_TYPE_PHONE:
-    GNS_edit_dialog_phone (edc);
-    break;
-  case GNUNET_GNSRECORD_TYPE_PKEY:
-    GNS_edit_dialog_pkey (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_PTR:
-    GNS_edit_dialog_ptr (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_MX:
-    GNS_edit_dialog_mx (edc);
-    break;
-  case GNUNET_GNSRECORD_TYPE_GNS2DNS:
-    GNS_edit_dialog_gns2dns (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_SOA:
-    GNS_edit_dialog_soa (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_SRV:
-    GNS_edit_dialog_srv (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_TXT:
-    GNS_edit_dialog_txt (edc);
-    break;
-  case GNUNET_GNSRECORD_TYPE_VPN:
-    GNS_edit_dialog_vpn (edc);
-    break;
-  case GNUNET_DNSPARSER_TYPE_TLSA:
-  default:
-    GNUNET_break (0);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load plugin for record type %d\n"),
+                (int) n_type);
     edit_dialog_continuation (edc,
-                              GTK_RESPONSE_CANCEL);
-    break;
+                              GTK_RESPONSE_CANCEL);
+    return;
   }
+  edc->builder = GNUNET_GTK_get_new_builder2 (edc->plugin->dialog_glade_filename,
+                                              edc,
+                                              &add_symbols);
+  if (NULL == edc->builder)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Failed to load dialog resource `%s'\n"),
+                edc->plugin->dialog_glade_filename);
+    edit_dialog_continuation (edc, GTK_RESPONSE_CANCEL);
+    return;
+  }
+  if (GNUNET_YES ==
+      edc->old_record_in_namestore)
+  {
+    edc->plugin->load (edc->plugin->cls,
+                       edc->n_value,
+                       edc->builder);
+  }
+  edc->dialog = GTK_DIALOG (gtk_builder_get_object (edc->builder,
+                                                    edc->plugin->dialog_widget_name));
+  g_signal_connect (edc->dialog,
+                    "response",
+                    G_CALLBACK (&edit_dialog_response_cb),
+                    edc);
+  edit_dialog_setup_common_elements (edc);
+  setup_zone (edc);
+  gtk_dialog_set_default_response (edc->dialog,
+                                   GTK_RESPONSE_OK);
+  gtk_window_present (GTK_WINDOW (edc->dialog));
 }
 
 
@@ -1186,7 +1647,7 @@ check_permissions (struct RecordInfo *ri,
  */
 void
 gnunet_namestore_gtk_popup_edit_button_activate_cb (GtkWidget *widget,
-                                                        gpointer user_data)
+                                                    gpointer user_data)
 {
   GtkTreeSelection *sel;
   gint n_type;
@@ -1239,9 +1700,9 @@ gnunet_namestore_gtk_popup_edit_button_activate_cb (GtkWidget *widget,
  */
 void
 gnunet_namestore_gtk_type_cellrenderercombo_edited_cb (GtkCellRendererText *text,
-                                                           gchar *path_string,
-                                                           gchar *new_text,
-                                                           gpointer user_data)
+                                                       gchar *path_string,
+                                                       gchar *new_text,
+                                                       gpointer user_data)
 {
   GtkTreeIter it;
   guint type;
@@ -2281,7 +2742,8 @@ main (int argc, char *const *argv)
   if (GNUNET_OK ==
       GNUNET_GTK_main_loop_start ("gnunet-namestore-gtk",
                                   "gnunet-namestore-gtk", argc, argv,
-                                  options, "gnunet_namestore_gtk_main_window.glade",
+                                  options,
+                                  "gnunet_namestore_gtk_main_window.glade",
                                   &run))
     ret = gret;
   else
@@ -2290,5 +2752,4 @@ main (int argc, char *const *argv)
 }
 
 
-
 /* end of gnunet-namestore-gtk.c */