more editing signals in TLSA dialog

3 files changed, 97 insertions, 20 deletions

diff --git a/src/namestore/plugin_gtk_namestore_box.c b/src/namestore/plugin_gtk_namestore_box.c
index 20c0efbd..4641613c 100644
--- a/src/namestore/plugin_gtk_namestore_box.c
+++ b/src/namestore/plugin_gtk_namestore_box.c
@@ -213,11 +213,25 @@ libgnunet_plugin_gtk_namestore_box_init (void *cls)
   struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
   static struct GNUNET_GTK_NAMESTORE_Symbol symbols[] = {
+    /* SRV plugin */
     { "GNS_edit_dialog_srv_target_entry_changed_cb",
       G_CALLBACK (GNS_edit_dialog_srv_target_entry_changed_cb) },
+    /* TLSA plugin */
+    { "tlsa_value_textbuffer_changed_cb",
+      G_CALLBACK (tlsa_value_textbuffer_changed_cb) },
+    { "edit_dialog_tlsa_selector_radiobutton_toggled_cb",
+      G_CALLBACK (edit_dialog_tlsa_selector_radiobutton_toggled_cb) },
+    { "edit_dialog_tlsa_usage_radiobutton_toggled_cb",
+      G_CALLBACK (edit_dialog_tlsa_usage_radiobutton_toggled_cb) },
+    { "edit_dialog_tlsa_matching_type_radiobutton_toggled_cb",
+      G_CALLBACK (edit_dialog_tlsa_matching_type_radiobutton_toggled_cb) },
+    { "tlsa_import_button_clicked_cb",
+      G_CALLBACK (tlsa_import_button_clicked_cb) },
+    { "edit_dialog_tlsa_import_entry_changed_cb",
+      G_CALLBACK (edit_dialog_tlsa_import_entry_changed_cb) },
+    /* generic CBs */
     { "edit_dialog_protocol_combobox_changed_cb",
       G_CALLBACK (edit_dialog_protocol_combobox_changed_cb) },
-    /* FIXME: add TLSA symbols! */
     /* need to include symbols from all boxed types here */
     { NULL, NULL }
   };
diff --git a/src/namestore/plugin_gtk_namestore_srv.c b/src/namestore/plugin_gtk_namestore_srv.c
index 6b91566d..e6f4338d 100644
--- a/src/namestore/plugin_gtk_namestore_srv.c
+++ b/src/namestore/plugin_gtk_namestore_srv.c
@@ -274,6 +274,7 @@ libgnunet_plugin_gtk_namestore_srv_init (void *cls)
   static struct GNUNET_GTK_NAMESTORE_Symbol symbols[] = {
     { "GNS_edit_dialog_srv_target_entry_changed_cb",
       G_CALLBACK (GNS_edit_dialog_srv_target_entry_changed_cb) },
+    /* generic CBs */
     { "edit_dialog_protocol_combobox_changed_cb",
       G_CALLBACK (edit_dialog_protocol_combobox_changed_cb) },
     { NULL, NULL }
diff --git a/src/namestore/plugin_gtk_namestore_tlsa.c b/src/namestore/plugin_gtk_namestore_tlsa.c
index 02ca3c5c..c79e92bb 100644
--- a/src/namestore/plugin_gtk_namestore_tlsa.c
+++ b/src/namestore/plugin_gtk_namestore_tlsa.c
@@ -42,9 +42,60 @@
  * @param user_data the plugin environment
  */
 static void
-edit_dialog_tlsa_value_textview_preedit_changed_cb (GtkTextView *textview,
-                                                    gchar *preedit,
-                                                    gpointer user_data)
+tlsa_value_textbuffer_changed_cb (GtkTextView *textview,
+                                  gchar *preedit,
+                                  gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+
+  edc->check_validity (edc);
+}
+
+
+/**
+ * The user has changed the selector.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param togglebutton button that changed editing widget
+ * @param user_data the plugin environment
+ */
+static void
+edit_dialog_tlsa_selector_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
+                                                  gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+
+  edc->check_validity (edc);
+}
+
+
+/**
+ * The user has changed the usage.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param togglebutton button that changed editing widget
+ * @param user_data the plugin environment
+ */
+static void
+edit_dialog_tlsa_usage_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
+                                               gpointer user_data)
+{
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+
+  edc->check_validity (edc);
+}
+
+
+/**
+ * The user has changed the matching type.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param togglebutton button that changed editing widget
+ * @param user_data the plugin environment
+ */
+static void
+edit_dialog_tlsa_matching_type_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
+                                                       gpointer user_data)
 {
   struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
 
@@ -389,8 +440,6 @@ static int
 tlsa_validate (void *cls,
                GtkBuilder *builder)
 {
-  GtkEditable *entry;
-  const gchar *preedit;
   GtkComboBox *cb;
   GtkTreeIter iter;
   gchar *value;
@@ -402,17 +451,17 @@ tlsa_validate (void *cls,
   int ret;
   unsigned int matching_type;
 
-  entry = GTK_EDITABLE (gtk_builder_get_object (builder,
-                                                "edit_dialog_tlsa_target_entry"));
-  preedit = gtk_editable_get_chars (entry, 0, -1);
-  if ( (NULL == preedit) ||
-       (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
-    return GNUNET_SYSERR;
+  fprintf (stderr,
+           "Validating...\n");
   cb = GTK_COMBO_BOX (gtk_builder_get_object (builder,
                                               "edit_dialog_protocol_combobox"));
   if (! gtk_combo_box_get_active_iter (cb,
                                        &iter))
+  {
+    fprintf (stderr,
+             "No protocol selected...\n");
     return GNUNET_SYSERR;
+  }
 
   tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW
                                  (gtk_builder_get_object (builder,
@@ -432,6 +481,8 @@ tlsa_validate (void *cls,
                                      bin))
     {
       /* not hex */
+      fprintf (stderr,
+               "Certificate value is not in hex...\n");
       return GNUNET_SYSERR;
     }
     matching_type = get_selected_radio_value (builder,
@@ -447,7 +498,11 @@ tlsa_validate (void *cls,
           gnutls_pkcs7_import (pkcs7,
                                &datum,
                                GNUTLS_X509_FMT_DER))
+      {
+        fprintf (stderr,
+                 "Certificate value is not PKCS7...\n");
         ret = GNUNET_SYSERR;
+      }
       else
         ret = GNUNET_OK;
       gnutls_pkcs7_deinit (pkcs7);
@@ -489,8 +544,8 @@ tlsa_import_button_clicked_cb (GtkButton *button,
  * Update the import button's sensitivity.
  */
 static void
-GNS_edit_dialog_tlsa_entry_changed_cb (GtkEditable *entry,
-                                       gpointer user_data)
+edit_dialog_tlsa_import_entry_changed_cb (GtkEditable *entry,
+                                          gpointer user_data)
 {
   struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
   GtkWidget *button;
@@ -522,14 +577,21 @@ libgnunet_plugin_gtk_namestore_tlsa_init (void *cls)
   struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
   struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
   static struct GNUNET_GTK_NAMESTORE_Symbol symbols[] = {
-    { "edit_dialog_tlsa_value_textview_preedit_changed_cb",
-      G_CALLBACK (edit_dialog_tlsa_value_textview_preedit_changed_cb) },
-    { "edit_dialog_protocol_combobox_changed_cb",
-      G_CALLBACK (edit_dialog_protocol_combobox_changed_cb) },
+    { "tlsa_value_textbuffer_changed_cb",
+      G_CALLBACK (tlsa_value_textbuffer_changed_cb) },
+    { "edit_dialog_tlsa_selector_radiobutton_toggled_cb",
+      G_CALLBACK (edit_dialog_tlsa_selector_radiobutton_toggled_cb) },
+    { "edit_dialog_tlsa_usage_radiobutton_toggled_cb",
+      G_CALLBACK (edit_dialog_tlsa_usage_radiobutton_toggled_cb) },
+    { "edit_dialog_tlsa_matching_type_radiobutton_toggled_cb",
+      G_CALLBACK (edit_dialog_tlsa_matching_type_radiobutton_toggled_cb) },
     { "tlsa_import_button_clicked_cb",
       G_CALLBACK (tlsa_import_button_clicked_cb) },
-    { "GNS_edit_dialog_tlsa_entry_changed_cb",
-      G_CALLBACK (GNS_edit_dialog_tlsa_entry_changed_cb) },
+    { "edit_dialog_tlsa_import_entry_changed_cb",
+      G_CALLBACK (edit_dialog_tlsa_import_entry_changed_cb) },
+    /* generic CBs */
+    { "edit_dialog_protocol_combobox_changed_cb",
+      G_CALLBACK (edit_dialog_protocol_combobox_changed_cb) },
     { NULL, NULL }
   };