- fill values

1 files changed, 50 insertions, 14 deletions

diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index fe7919df..df1676af 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -144,27 +144,37 @@ GNUNET_GNS_GTK_name_cellrenderertext_edited_cb (GtkCellRendererText *renderer,
   GtkTreeIter it;
   GtkTreeModel *tm = GTK_TREE_MODEL(gns->ts);
 
-  gtk_tree_model_get_iter_from_string(tm, &it, path);
-  gtk_tree_store_set (gns->ts, &it, TREE_COL_NAME, new_text, -1);
-
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "New text for `%s' is `%s'\n", path, new_text);
   if ((0 == strcmp (path, "0")) && (0 != strcmp (new_text, NEW_RECORD_STR)) )
   {
     GNUNET_break (0);
-    /* add a new dummy line */
+    /* update name */
+    gtk_tree_model_get_iter_from_string(tm, &it, path);
+    gtk_tree_store_set (gns->ts, &it, TREE_COL_NAME, new_text, -1);
 
+    /* add a new dummy line */
+    gtk_tree_store_insert_with_values (gns->ts, &it,NULL, 0,
+        TREE_COL_NAME, _(NEW_RECORD_STR),
+        TREE_COL_RECORD_TYPE, 1,
+        -1);
+#if 0
     gtk_tree_store_append(gns->ts, &it, NULL);
     gtk_tree_store_set(gns->ts, &it,
-                       TREE_COL_NAME, _(NEW_RECORD_STR),
+                       TREE_COL_NAME, new_text,
                        TREE_COL_RECORD_TYPE, 1,
                        -1);
     /* add a new name */
-
+    gtk_tree_store_append(gns->ts, &it, NULL);
+    gtk_tree_store_set(gns->ts, &it,
+                       TREE_COL_NAME, new_text,
+                       TREE_COL_RECORD_TYPE, 1, -1);
+#endif
   }
   else
   {
     /* update name */
-
+    gtk_tree_model_get_iter_from_string(tm, &it, path);
+    gtk_tree_store_set (gns->ts, &it, TREE_COL_NAME, new_text, -1);
   }
 }
 
@@ -220,7 +230,12 @@ void zone_iteration_proc (void *cls,
 
   GNUNET_assert(GTK_IS_TREE_STORE(zc_ctx->gns->ts));
   gtk_tree_store_append(zc_ctx->gns->ts, &toplevel, NULL);
-
+  /*
+  GtkCellRenderer *renderer ;
+  g_object_set(renderer,
+               "editable", FALSE,
+               NULL);
+*/
   gtk_tree_store_set(zc_ctx->gns->ts, &toplevel,
                      TREE_COL_NAME, name,
                      -1);
@@ -228,7 +243,27 @@ void zone_iteration_proc (void *cls,
   /* Append elements for records */
   for (c = 0; c < rd_count; c ++)
   {
-    gtk_tree_store_append(zc_ctx->gns->ts, &child, &toplevel);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Record %u: type %u flags %u expiration %llu data_size %u\n",
+        c, rd[c].record_type, rd[c].flags, rd[c].expiration, rd[c].data_size);
+
+    /* Set public toggle */
+    int public;
+    if (rd[c].flags != GNUNET_NAMESTORE_RF_PRIVATE)
+      public = GNUNET_YES;
+    else
+      public = GNUNET_NO;
+
+    /* Expiration time */
+    char * exp = GNUNET_STRINGS_absolute_time_to_string (rd[c].expiration);
+
+    gtk_tree_store_insert_with_values(zc_ctx->gns->ts, &child , &toplevel, 0,
+                                       TREE_COL_NAME, "",
+                                       TREE_COL_RECORD_TYPE, rd[c].record_type,
+                                       TREE_COL_IS_PUBLIC, public,
+                                       TREE_COL_EXP_TIME_AS_STR, exp,
+                                       -1);
+
+    GNUNET_free (exp);
   }
 
   GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);
@@ -249,11 +284,12 @@ GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
   GtkTreeIter toplevel;
 
   /* Append a top level row and leave it empty */
-  gtk_tree_store_append(gns->ts, &toplevel, NULL);
-  gtk_tree_store_set(gns->ts, &toplevel,
-                     TREE_COL_NAME, _(NEW_RECORD_STR),
-                     TREE_COL_RECORD_TYPE, 1,
-                     -1);
+  //gtk_tree_store_append(gns->ts, &toplevel, NULL);
+
+  gtk_tree_store_insert_with_values(gns->ts, &toplevel, NULL, 0,
+                                     TREE_COL_NAME, _(NEW_RECORD_STR),
+                                     TREE_COL_RECORD_TYPE, 1,
+                                     -1);
 
   zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
   zc_ctx->gns = user_data;