1 files changed, 13 insertions, 9 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 59edb42b..ed3ff064 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -67,7 +67,7 @@ struct GNUNET_GNS_Context
    */
   struct GNUNET_NAMESTORE_Handle *ns;
 
-  GtkBuilder builder;
+  GtkBuilder *builder;
 
 
 };
@@ -245,6 +245,7 @@ GNUNET_GNS_GTK_public_key_copy_button_clicked_cb (GtkButton *button,
 static void
 shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+
   struct GNUNET_GNS_Context *gns = cls;
   GNUNET_assert (gns != NULL);
   if (NULL != gns->ns)
@@ -383,20 +384,14 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   }
 
-  struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
-  zc_ctx->zone = zone;
-  GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &zone,
-      GNUNET_NAMESTORE_RF_NONE,
-      GNUNET_NAMESTORE_RF_NONE,
-      &zone_iteration_proc,
-      zc_ctx);
-
   if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, gns))
   {
     GNUNET_break (0);
     GNUNET_SCHEDULER_add_now (&shutdown_task, gns);
     return;
   }
+  gns->builder = GNUNET_GTK_main_loop_get_builder(ml);
+
   zone_as_string = GNUNET_strdup (GNUNET_h2s_full (&zone));
   label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
                                    zone_as_string);
@@ -413,12 +408,21 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                "gnunet-gtk" /* FIXME: different icon? */ ,
                                "gnunet-gns-gtk");
 
+  struct ZoneIteration_Context * zc_ctx = GNUNET_malloc (sizeof (struct ZoneIteration_Context));
+  zc_ctx->zone = zone;
+  GNUNET_NAMESTORE_zone_iteration_start(gns->ns, &zone,
+      GNUNET_NAMESTORE_RF_NONE,
+      GNUNET_NAMESTORE_RF_NONE,
+      &zone_iteration_proc,
+      zc_ctx);
+
   /* make GUI visible */
   if (!tray_only)
   {
     gtk_widget_show (main_window);
     gtk_window_present (GTK_WINDOW (main_window));
   }
+
 }