[GNUnet-SVN] r20550 - gnunet-gtk/src/gns

[gnunet]

Author: wachs
Date: 2012-03-15 20:11:58 +0100 (Thu, 15 Mar 2012)
New Revision: 20550

Modified:
   gnunet-gtk/src/gns/gnunet-gns-gtk.c
   gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
Log:
- more


Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-15 18:39:38 UTC (rev 20549)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-15 19:11:58 UTC (rev 20550)
@@ -314,6 +314,11 @@
                "ZONEKEY", "gns");
     return;
   }
+  else
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Using `%s'\n", keyfile);
+  }
   gns->pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   keyfile = NULL;

Modified: gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-15 18:39:38 UTC (rev 
20549)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk_zone.c    2012-03-15 19:11:58 UTC (rev 
20550)
@@ -140,12 +140,26 @@
   return FALSE;
 }
 
+enum
+{
+  TREE_COL_NAME = 0,
+  TREE_COL_IS_PUBLIC,
+  TREE_COL_RECORD_TYPE,
+  TREE_COL_RECORD_TYPE_AS_STR,
+  TREE_COL_EXP_TIME,
+  TREE_COL_EXP_TIME_IS_REL,
+  TREE_COL_EXP_TIME_AS_STR,
+  TREE_COL_VAL_AS_STR,
+  TREE_COL_VAL_COLOR,
 
+};
 
 struct ZoneIteration_Context
 {
+  struct GNUNET_GNS_Context *gns;
   GNUNET_HashCode zone;
   struct GNUNET_NAMESTORE_ZoneIterator * it;
+  GtkTreeStore *ts;
 };
 
 void zone_iteration_proc (void *cls,
@@ -157,13 +171,22 @@
                           const struct GNUNET_CRYPTO_RsaSignature *signature)
 {
   struct ZoneIteration_Context * zc_ctx = cls;
+  GtkTreeIter toplevel;
   GNUNET_assert (zc_ctx != NULL);
   if ((NULL == zone_key) && (NULL == name))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone iteration done\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s 'iteration done\n", 
GNUNET_h2s(&zc_ctx->zone));
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone iteration dummy\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone `%s' iteration result `%s'\n", 
GNUNET_h2s(&zc_ctx->zone), name);
+
+  GNUNET_assert(GTK_IS_TREE_STORE(zc_ctx->ts));
+  gtk_tree_store_append(zc_ctx->ts, &toplevel, NULL);
+
+  gtk_tree_store_set(zc_ctx->ts, &toplevel,
+                     TREE_COL_NAME, name,
+                     -1);
+  GNUNET_NAMESTORE_zone_iterator_next(zc_ctx->it);
 }
 
 /**
@@ -178,11 +201,11 @@
 {
   struct GNUNET_GNS_Context *gns = user_data;
   GtkBuilder *builder = gns->builder;
+  struct ZoneIteration_Context *zc_ctx;
   GtkTreeStore *ts;
   GtkTreeIter toplevel;
 
   GNUNET_assert (GTK_IS_BUILDER(builder));
-  GNUNET_break (0);
 
   ts  = GTK_TREE_STORE (gtk_builder_get_object (builder, 
"GNUNET_GNS_GTK_treestore"));
   GNUNET_assert (GTK_IS_TREE_STORE(ts));
@@ -190,17 +213,22 @@
 
   /* Append a top level row and leave it empty */
   gtk_tree_store_append(ts, &toplevel, NULL);
+  gtk_tree_store_set(ts, &toplevel,
+                     TREE_COL_NAME, _("<new record>"),
+                     TREE_COL_RECORD_TYPE, 1,
+                     -1);
 
-  struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct 
ZoneIteration_Context));
+  zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
+  zc_ctx->gns = user_data;
   zc_ctx->zone = gns->zone;
-  GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &gns->zone,
+  zc_ctx->ts = ts;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Starting one `%s' iteration\n", 
GNUNET_h2s(&zc_ctx->zone));
+
+  zc_ctx->it = GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &gns->zone,
       GNUNET_NAMESTORE_RF_NONE,
       GNUNET_NAMESTORE_RF_NONE,
       &zone_iteration_proc,
       zc_ctx);
-
-
-  GNUNET_break (0);
 }