1 files changed, 19 insertions, 2 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index dcf4ca67..70fa5314 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -237,15 +237,18 @@ GNUNET_GNS_GTK_zone_open_dialog_response_cb (GtkDialog * dialog,
   if (GTK_RESPONSE_OK != response_id)
   {
     gtk_widget_destroy (GTK_WIDGET (dialog));
-    g_object_unref (G_OBJECT (builder));
+    g_object_unref (G_OBJECT (dialog));
     return;
   }
   filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog));
   gtk_widget_destroy (GTK_WIDGET (dialog));
-  g_object_unref (G_OBJECT (builder));
+  g_object_unref (G_OBJECT (dialog));
 
   /* FIXME: move to new zone 'filename' */
   fprintf (stderr, "Got zone `%s'\n", filename);
+
+  fork();
+
   GNUNET_free (filename);  
 }
 
@@ -367,6 +370,7 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
   GtkWidget *dialog;
   char *label;
   char *keyfile;
+  char *servicehome;
 
   gns = GNUNET_malloc (sizeof (struct GNUNET_GNS_Context));
 
@@ -386,6 +390,19 @@ namestore_service_check (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t
    return;
   }
 
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (),
+                                                            "PATHS",
+                                                            "SERVICEHOME",
+                                                            &servicehome))
+  {
+    GNUNET_asprintf(&zonekey_directory, "");
+  }
+  else
+  {
+    GNUNET_asprintf(&zonekey_directory, "%s%s%s",servicehome, DIR_SEPARATOR_STR, "gns");
+    GNUNET_free (servicehome);
+  }
+
   /* setup crypto keys */
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (),
                                                             "gns",