1 files changed, 41 insertions, 8 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 04145ac2..9f21abbd 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -160,7 +160,13 @@ enum GNSTreestoreColumn
   /**
    * A guint; offset of this record in the array.
    */
-  GNS_TREESTORE_COL_RECORD_OFFSET
+  GNS_TREESTORE_COL_RECORD_OFFSET,
+
+  /**
+   * A gboolean; TRUE if the record is pending approval
+   * and thus not usable for anyone right now.
+   */
+  GNS_TREESTORE_COL_IS_PENDING
 };
 
 
@@ -203,7 +209,7 @@ enum ZONE_COLUMNS
 
 
 /**
- * Closure for 'operation_done_cont'.
+ * Closure for #operation_done_cont().
  */
 struct OperationContext
 {
@@ -227,7 +233,7 @@ struct OperationContext
 
 
 /**
- * Closure for 'merge_with_existing_records'.
+ * Closure for #merge_with_existing_records().
  */
 struct MoveOperationContext
 {
@@ -258,6 +264,8 @@ struct MoveOperationContext
   struct GNUNET_CRYPTO_EcdsaPrivateKey pk;
 
   /**
+
+
    * Data to free.
    */
   void *data;
@@ -614,6 +622,9 @@ gnunet_namestore_gtk_qr_save_as_dialog_response_cb (GtkDialog *dialog,
 /**
  * User clicked on 'save as' to extract the QR code.  Open 'save as'
  * dialog to get the desired filename and file type.
+ *
+ * @param button the 'save as' button
+ * @param user_data unused
  */
 void
 gnunet_namestore_gtk_qr_saveas_button_clicked_cb (GtkButton *button,
@@ -975,6 +986,8 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
     rd.flags = GNUNET_GNSRECORD_RF_PRIVATE;
   if (edc->n_is_shadow)
     rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+  if (edc->n_is_pending)
+    rd.flags |= GNUNET_GNSRECORD_RF_PENDING;
   rd.record_type = edc->record_type;
   rd.expiration_time = edc->n_exp_time;
   if (edc->n_is_relative)
@@ -1224,6 +1237,10 @@ edit_dialog_setup_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
                                                                            "edit_dialog_options_shadow_checkbutton")),
                                 edc->n_is_shadow);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                           "edit_dialog_options_pending_checkbutton")),
+                                edc->n_is_pending);
+
   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,
@@ -1322,6 +1339,9 @@ edit_dialog_putes_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment
   /* 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")));
+  /* is pending flag */
+  edc->n_is_pending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
+                                                                                              "edit_dialog_options_pending_checkbutton")));
 
   /* 'forever' expiration time */
   if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
@@ -1568,6 +1588,7 @@ launch_edit_dialog (gint n_type,
     edc->n_public = (0 == (rd_old[off].flags & GNUNET_GNSRECORD_RF_PRIVATE));
     edc->n_is_relative = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
     edc->n_is_shadow = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD));
+    edc->n_is_pending = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_PENDING));
     edc->n_exp_time = rd_old[off].expiration_time;
     edc->old_record_in_namestore = GNUNET_YES;
   }
@@ -1943,8 +1964,8 @@ gnunet_namestore_gtk_treeview_button_press_event_cb (GtkWidget *widget,
  */
 gboolean
 gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
-                                                   GdkEventKey *event,
-                                                   gpointer user_data)
+                                                  GdkEventKey *event,
+                                                  gpointer user_data)
 {
   GtkTreeIter iter;
   GtkTreeSelection *sel;
@@ -1988,6 +2009,7 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
     guint64 n_exp_time;
     gboolean n_is_relative;
     gboolean n_is_shadow;
+    gboolean n_is_pending;
     char *n_value;
 
     /* Removing a single record */
@@ -2005,6 +2027,7 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
                         GNS_TREESTORE_COL_EXP_TIME, &n_exp_time,
                         GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative,
                         GNS_TREESTORE_COL_IS_SHADOW, &n_is_shadow,
+                        GNS_TREESTORE_COL_IS_PENDING, &n_is_pending,
                         GNS_TREESTORE_COL_VAL_AS_STR, &n_value,
                         -1);
     /* valid name */
@@ -2016,6 +2039,8 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
       rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
     if (n_is_shadow)
       rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+    if (n_is_pending)
+      rd.flags |= GNUNET_GNSRECORD_RF_PENDING;
     rd.record_type = n_type;
     rd.expiration_time = n_exp_time;
     if (GNUNET_OK !=
@@ -2235,7 +2260,9 @@ zone_iteration_proc (void *cls,
   char *val;
   char *type_str;
   gboolean time_is_relative;
-  gboolean public;
+  gboolean is_public;
+  gboolean is_pending;
+  gboolean is_shadow;
   guint64 exp_t;
   GtkEntry *pseu_entry;
   struct GNUNET_HashCode name_hash;
@@ -2345,7 +2372,11 @@ zone_iteration_proc (void *cls,
                 rd[c].data_size);
 
     /* Set public toggle */
-    public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) != GNUNET_GNSRECORD_RF_PRIVATE);
+    is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) != GNUNET_GNSRECORD_RF_PRIVATE);
+    /* Set shadow toggle */
+    is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD) == GNUNET_GNSRECORD_RF_SHADOW_RECORD);
+    /* Set pending toggle */
+    is_pending = ((rd[c].flags & GNUNET_GNSRECORD_RF_PENDING) == GNUNET_GNSRECORD_RF_PENDING);
     /* Expiration time */
     time_is_relative = (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
 
@@ -2392,7 +2423,9 @@ zone_iteration_proc (void *cls,
                                        GNS_TREESTORE_COL_NAME_IS_VISIBLE, FALSE,
                                        GNS_TREESTORE_COL_RECORD_TYPE, rd[c].record_type,
                                        GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str,
-                                       GNS_TREESTORE_COL_IS_PUBLIC, public,
+                                       GNS_TREESTORE_COL_IS_PUBLIC, is_public,
+                                       GNS_TREESTORE_COL_IS_SHADOW, is_shadow,
+                                       GNS_TREESTORE_COL_IS_PENDING, is_pending,
                                        GNS_TREESTORE_COL_EXP_TIME, exp_t,
                                        GNS_TREESTORE_COL_EXP_TIME_AS_STR, exp,
                                        GNS_TREESTORE_COL_EXP_TIME_IS_REL, time_is_relative,