- clean up

3 files changed, 34 insertions, 49 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 99c5cae2..5af0a0b4 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -24,6 +24,7 @@
  * @author Christian Grothoff
  */
 #include "gnunet_gtk.h"
+#include "gnunet-gns-gtk.h"
 #include <gnunet/gnunet_namestore_service.h>
 
 /**
@@ -49,25 +50,6 @@ static char *zonekey_directory;
 
 static GtkWidget *main_window;
 
-struct GNUNET_GNS_Context
-{
-  /**
-   * Handle to the namestore.
-   */
-  struct GNUNET_NAMESTORE_Handle *ns;
-
-  GtkBuilder *builder;
-
-  struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
-  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
-
-  GNUNET_HashCode zone;
-
-
-
-};
-
-
 /**
  * Get cfg.
  */
@@ -295,32 +277,6 @@ GNUNET_GNS_GTK_main_window_delete_event_cb (GtkWidget *widget,
   GNUNET_SCHEDULER_add_now (&shutdown_task, user_data);
 }
 
-struct ZoneIteration_Context
-{
-  GNUNET_HashCode zone;
-  struct GNUNET_NAMESTORE_ZoneIterator * it;
-};
-
-void zone_iteration_proc (void *cls,
-                          const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
-                          struct GNUNET_TIME_Absolute expire,
-                          const char *name,
-                          unsigned int rd_len,
-                          const struct GNUNET_NAMESTORE_RecordData *rd,
-                          const struct GNUNET_CRYPTO_RsaSignature *signature)
-{
-  struct ZoneIteration_Context * zc_ctx = cls;
-  GNUNET_assert (zc_ctx != NULL);
-  if ((NULL == zone_key) && (NULL == name))
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone iteration done\n");
-    return;
-  }
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone iteration dummy\n");
-}
-
-
-
 /**
  * Actual main function run right after GNUnet's scheduler
  * is initialized.  Initializes up GTK and Glade.
diff --git a/src/gns/gnunet-gns-gtk.h b/src/gns/gnunet-gns-gtk.h
index 282f3039..b7165e49 100644
--- a/src/gns/gnunet-gns-gtk.h
+++ b/src/gns/gnunet-gns-gtk.h
@@ -36,10 +36,15 @@ struct GNUNET_GNS_Context
 
   GtkBuilder *builder;
 
+  struct GNUNET_CRYPTO_RsaPrivateKey *pkey;
+  struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pubkey;
 
+  GNUNET_HashCode zone;
 };
 
 
 
 
+
+
 /* end of gnunet-gns-gtk.h */
diff --git a/src/gns/gnunet-gns-gtk_zone.c b/src/gns/gnunet-gns-gtk_zone.c
index dd88df89..181665ab 100644
--- a/src/gns/gnunet-gns-gtk_zone.c
+++ b/src/gns/gnunet-gns-gtk_zone.c
@@ -140,6 +140,32 @@ GNUNET_GNS_GTK_main_treeview_popup_menu_cb (GtkWidget *widget,
   return FALSE;
 }
 
+
+
+struct ZoneIteration_Context
+{
+  GNUNET_HashCode zone;
+  struct GNUNET_NAMESTORE_ZoneIterator * it;
+};
+
+void zone_iteration_proc (void *cls,
+                          const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
+                          struct GNUNET_TIME_Absolute expire,
+                          const char *name,
+                          unsigned int rd_len,
+                          const struct GNUNET_NAMESTORE_RecordData *rd,
+                          const struct GNUNET_CRYPTO_RsaSignature *signature)
+{
+  struct ZoneIteration_Context * zc_ctx = cls;
+  GNUNET_assert (zc_ctx != NULL);
+  if ((NULL == zone_key) && (NULL == name))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone iteration done\n");
+    return;
+  }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Zone iteration dummy\n");
+}
+
 /**
  * The zone treeview was realized.   Setup the model.
  *
@@ -165,15 +191,13 @@ GNUNET_GNS_GTK_main_treeview_realize_cb (GtkWidget *widget,
   /* Append a top level row and leave it empty */
   gtk_tree_store_append(ts, &toplevel, NULL);
 
-  /*
   struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
-  zc_ctx->zone = zone;
-  GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &zone,
+  zc_ctx->zone = gns->zone;
+  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);