1 files changed, 121 insertions, 22 deletions

diff --git a/src/setup/gnunet-setup-gns-edit.c b/src/setup/gnunet-setup-gns-edit.c
index 3286f7b4..f4e6de65 100644
--- a/src/setup/gnunet-setup-gns-edit.c
+++ b/src/setup/gnunet-setup-gns-edit.c
@@ -26,6 +26,57 @@
 
 
 /**
+ * Editing dialog was closed, get the data and call the
+ * continuation.
+ *
+ * @param dialog editing dialog
+ * @param user_data the 'struct EditDialogContext'
+ */
+void
+GNS_edit_a_dialog_response_cb (GtkDialog *dialog,
+                               gint response_id,
+                               gpointer user_data)
+{
+  struct EditDialogContext *edc = user_data;
+
+  fprintf (stderr, "response CB %d!\n", response_id);
+  /* FIXME: resync dialog elements back into 'edc'! */
+  gtk_widget_destroy (GTK_WIDGET (edc->dialog));
+  g_object_unref (edc->builder);
+  edc->builder = NULL;
+  edc->cont (edc, response_id);
+}
+
+
+/**
+ * Disable 'save' button, dialog state is not acceptable.
+ *
+ * @param edc dialog to modify
+ */
+static void
+edit_dialog_disable_save (struct EditDialogContext *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 EditDialogContext *edc)
+{  
+  gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                                "edit_dialog_save_button")),
+                            TRUE);
+}
+
+
+/**
  * Initialize widgets of the edit dialog that are the same regardless of
  * the type of the record.
  *
@@ -39,9 +90,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
   {
     gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
                                                          "edit_dialog_delete_button")));
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (edc->builder,
-                                                                  "edit_dialog_save_button")),
-                              FALSE);
+    edit_dialog_disable_save (edc);
   }
   gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
                                                          "edit_dialog_name_entry")),
@@ -54,6 +103,7 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
                                 edc->n_is_shadow);
   if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value == edc->n_exp_time)
   {
+    fprintf (stderr, "forever\n");
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                              "edit_dialog_expiration_never_radiobutton")),
                                   TRUE);
@@ -70,16 +120,22 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
     {
       struct GNUNET_TIME_Relative rt;
 
+      fprintf (stderr, "relative\n");
       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_relative_combobox")));
+                                                           "edit_dialog_expiration_absolute_calendar")));
+      gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+                                                           "edit_dialog_expiration_absolute_hbox")));
       rt.rel_value = edc->n_exp_time;
-      gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
-                                                             "edit_dialog_expiration_relative_combobox")),
-                          GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_NO));
-
+#if 0
+      /* FIXME: gtk_combo_box_set_text does not exist, we need to
+         update the model and then select the respective element... */
+      gtk_combo_box_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
+                                                                 "edit_dialog_expiration_relative_combobox")),
+                              GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_NO));
+#endif
     }
     else
     {
@@ -88,13 +144,13 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
       struct tm *ymd;
       GtkCalendar *cal;
       
+      fprintf (stderr, "absolute\n");
       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_absolute_calendar")));
-      gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
-                                                           "edit_dialog_expiration_absolute_hbox")));
+                                                           "edit_dialog_expiration_relative_combobox")));
       at.abs_value = edc->n_exp_time;
       tp = (time_t) (at.abs_value / 1000LL); /* convert to seconds */
       ymd = gmtime (&tp);
@@ -120,6 +176,51 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
 
 
 /**
+ * Run the edit dialog.  Performs all of the common initialization
+ * steps to run an edit dialog for records.
+ *
+ * @param edc editing context
+ */
+static void
+run_edit_dialog (struct EditDialogContext *edc)
+{
+  edit_dialog_setup_common_elements (edc);
+  edc->dialog = GTK_DIALOG (gtk_builder_get_object (edc->builder,
+                                                    "edit_a_dialog"));
+  gtk_dialog_set_default_response (edc->dialog,
+                                   GTK_RESPONSE_OK);
+  gtk_window_present (GTK_WINDOW (edc->dialog));
+}
+
+
+/* ************************ A records *********************** */
+
+/**
+ * The user has edited the A record value.  Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param entry editing widget
+ * @param preedit new value
+ * @param user_data the 'struct EditDialogContext' of the dialog
+ */
+void
+GNS_edit_dialog_a_entry_changed_cb (GtkEditable *entry,
+                                    gpointer user_data)
+{
+  struct EditDialogContext *edc = user_data;
+  const gchar *preedit;
+  struct in_addr v4;
+
+  preedit = gtk_editable_get_chars (entry, 0, -1);
+  if ( (NULL != preedit) &&
+       (1 == inet_pton (AF_INET, preedit, &v4)) )
+    edit_dialog_enable_save (edc);
+  else
+    edit_dialog_disable_save (edc);
+}
+
+
+/**
  * Run an GNS Edit dialog for an 'A' Record.
  *
  * @param cont continuation to call when done
@@ -128,8 +229,6 @@ edit_dialog_setup_common_elements (struct EditDialogContext *edc)
 void
 GNS_edit_dialog_a (struct EditDialogContext *edc)
 {
-  GtkDialog *dialog;
-
   edc->builder = GNUNET_GTK_get_new_builder ("gnunet_setup_gns_edit_a.glade",
                                              edc);
   if (NULL == edc->builder)
@@ -138,15 +237,15 @@ GNS_edit_dialog_a (struct EditDialogContext *edc)
     edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
     return;    
   }
-  edit_dialog_setup_common_elements (edc);
-  dialog = GTK_DIALOG (gtk_builder_get_object (edc->builder,
-                                               "edit_a_dialog"));
-  gtk_dialog_set_default_response (GTK_DIALOG (dialog),
-                                   GTK_RESPONSE_OK);
-  gtk_window_present (GTK_WINDOW (dialog));
-
-  GNUNET_break (0); /* not implemented */
-  edc->cont (edc, GTK_RESPONSE_CANCEL);  /* treat as 'cancel' */
+  if (GNUNET_YES ==
+      edc->old_record_in_namestore)
+  {
+    /* set A record */
+    gtk_entry_set_text (GTK_ENTRY (gtk_builder_get_object (edc->builder,
+                                                           "edit_dialog_a_entry")),
+                        edc->n_value);
+  }
+  run_edit_dialog (edc);
 }