aboutsummaryrefslogtreecommitdiff
path: root/src/namestore/gnunet-namestore-gtk.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/namestore/gnunet-namestore-gtk.c')
-rw-r--r--src/namestore/gnunet-namestore-gtk.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 872baff5..bdef8986 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -160,13 +160,8 @@ enum GNSTreestoreColumn
160 /** 160 /**
161 * A guint; offset of this record in the array. 161 * A guint; offset of this record in the array.
162 */ 162 */
163 GNS_TREESTORE_COL_RECORD_OFFSET, 163 GNS_TREESTORE_COL_RECORD_OFFSET
164 164
165 /**
166 * A gboolean; TRUE if the record is pending approval
167 * and thus not usable for anyone right now.
168 */
169 GNS_TREESTORE_COL_IS_PENDING
170}; 165};
171 166
172 167
@@ -987,8 +982,6 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
987 rd.flags = GNUNET_GNSRECORD_RF_PRIVATE; 982 rd.flags = GNUNET_GNSRECORD_RF_PRIVATE;
988 if (edc->n_is_shadow) 983 if (edc->n_is_shadow)
989 rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD; 984 rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
990 if (edc->n_is_pending)
991 rd.flags |= GNUNET_GNSRECORD_RF_PENDING;
992 rd.record_type = edc->record_type; 985 rd.record_type = edc->record_type;
993 rd.expiration_time = edc->n_exp_time; 986 rd.expiration_time = edc->n_exp_time;
994 if (edc->n_is_relative) 987 if (edc->n_is_relative)
@@ -1238,9 +1231,6 @@ edit_dialog_setup_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment
1238 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 1231 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
1239 "edit_dialog_options_shadow_checkbutton")), 1232 "edit_dialog_options_shadow_checkbutton")),
1240 edc->n_is_shadow); 1233 edc->n_is_shadow);
1241 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
1242 "edit_dialog_options_pending_checkbutton")),
1243 edc->n_is_pending);
1244 1234
1245 if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time) 1235 if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time)
1246 { 1236 {
@@ -1340,9 +1330,6 @@ edit_dialog_putes_common_elements (struct GNUNET_GTK_NAMESTORE_PluginEnvironment
1340 /* is shadow flag */ 1330 /* is shadow flag */
1341 edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 1331 edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
1342 "edit_dialog_options_shadow_checkbutton"))); 1332 "edit_dialog_options_shadow_checkbutton")));
1343 /* is pending flag */
1344 edc->n_is_pending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
1345 "edit_dialog_options_pending_checkbutton")));
1346 1333
1347 /* 'forever' expiration time */ 1334 /* 'forever' expiration time */
1348 if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder, 1335 if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (edc->builder,
@@ -1589,7 +1576,6 @@ launch_edit_dialog (gint n_type,
1589 edc->n_public = (0 == (rd_old[off].flags & GNUNET_GNSRECORD_RF_PRIVATE)); 1576 edc->n_public = (0 == (rd_old[off].flags & GNUNET_GNSRECORD_RF_PRIVATE));
1590 edc->n_is_relative = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)); 1577 edc->n_is_relative = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
1591 edc->n_is_shadow = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)); 1578 edc->n_is_shadow = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD));
1592 edc->n_is_pending = (0 != (rd_old[off].flags & GNUNET_GNSRECORD_RF_PENDING));
1593 edc->n_exp_time = rd_old[off].expiration_time; 1579 edc->n_exp_time = rd_old[off].expiration_time;
1594 edc->old_record_in_namestore = GNUNET_YES; 1580 edc->old_record_in_namestore = GNUNET_YES;
1595 } 1581 }
@@ -2021,7 +2007,6 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
2021 guint64 n_exp_time; 2007 guint64 n_exp_time;
2022 gboolean n_is_relative; 2008 gboolean n_is_relative;
2023 gboolean n_is_shadow; 2009 gboolean n_is_shadow;
2024 gboolean n_is_pending;
2025 char *n_value; 2010 char *n_value;
2026 2011
2027 /* Removing a single record */ 2012 /* Removing a single record */
@@ -2039,7 +2024,6 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
2039 GNS_TREESTORE_COL_EXP_TIME, &n_exp_time, 2024 GNS_TREESTORE_COL_EXP_TIME, &n_exp_time,
2040 GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative, 2025 GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative,
2041 GNS_TREESTORE_COL_IS_SHADOW, &n_is_shadow, 2026 GNS_TREESTORE_COL_IS_SHADOW, &n_is_shadow,
2042 GNS_TREESTORE_COL_IS_PENDING, &n_is_pending,
2043 GNS_TREESTORE_COL_VAL_AS_STR, &n_value, 2027 GNS_TREESTORE_COL_VAL_AS_STR, &n_value,
2044 -1); 2028 -1);
2045 /* valid name */ 2029 /* valid name */
@@ -2051,8 +2035,6 @@ gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
2051 rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION; 2035 rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
2052 if (n_is_shadow) 2036 if (n_is_shadow)
2053 rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD; 2037 rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
2054 if (n_is_pending)
2055 rd.flags |= GNUNET_GNSRECORD_RF_PENDING;
2056 rd.record_type = n_type; 2038 rd.record_type = n_type;
2057 rd.expiration_time = n_exp_time; 2039 rd.expiration_time = n_exp_time;
2058 if (GNUNET_OK != 2040 if (GNUNET_OK !=
@@ -2273,7 +2255,6 @@ zone_iteration_proc (void *cls,
2273 char *type_str; 2255 char *type_str;
2274 gboolean time_is_relative; 2256 gboolean time_is_relative;
2275 gboolean is_public; 2257 gboolean is_public;
2276 gboolean is_pending;
2277 gboolean is_shadow; 2258 gboolean is_shadow;
2278 guint64 exp_t; 2259 guint64 exp_t;
2279 GtkEntry *pseu_entry; 2260 GtkEntry *pseu_entry;
@@ -2389,8 +2370,6 @@ zone_iteration_proc (void *cls,
2389 is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) != GNUNET_GNSRECORD_RF_PRIVATE); 2370 is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) != GNUNET_GNSRECORD_RF_PRIVATE);
2390 /* Set shadow toggle */ 2371 /* Set shadow toggle */
2391 is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD) == GNUNET_GNSRECORD_RF_SHADOW_RECORD); 2372 is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD) == GNUNET_GNSRECORD_RF_SHADOW_RECORD);
2392 /* Set pending toggle */
2393 is_pending = ((rd[c].flags & GNUNET_GNSRECORD_RF_PENDING) == GNUNET_GNSRECORD_RF_PENDING);
2394 /* Expiration time */ 2373 /* Expiration time */
2395 time_is_relative = (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION)); 2374 time_is_relative = (0 != (rd[c].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
2396 2375
@@ -2442,7 +2421,6 @@ zone_iteration_proc (void *cls,
2442 GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str, 2421 GNS_TREESTORE_COL_RECORD_TYPE_AS_STR, type_str,
2443 GNS_TREESTORE_COL_IS_PUBLIC, is_public, 2422 GNS_TREESTORE_COL_IS_PUBLIC, is_public,
2444 GNS_TREESTORE_COL_IS_SHADOW, is_shadow, 2423 GNS_TREESTORE_COL_IS_SHADOW, is_shadow,
2445 GNS_TREESTORE_COL_IS_PENDING, is_pending,
2446 GNS_TREESTORE_COL_EXP_TIME, exp_t, 2424 GNS_TREESTORE_COL_EXP_TIME, exp_t,
2447 GNS_TREESTORE_COL_EXP_TIME_AS_STR, exp, 2425 GNS_TREESTORE_COL_EXP_TIME_AS_STR, exp,
2448 GNS_TREESTORE_COL_EXP_TIME_IS_REL, time_is_relative, 2426 GNS_TREESTORE_COL_EXP_TIME_IS_REL, time_is_relative,