- setting default dir

1 files changed, 17 insertions, 8 deletions

diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index da5ee2e8..f2d6f219 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -59,7 +59,7 @@ static char *zone_as_string;
 /**
  * Default directory of zone files as a string.
  */
-static char *zonefile_directory;
+static char *zonekey_directory;
 
 static GtkWidget *main_window;
 
@@ -176,6 +176,7 @@ GNUNET_GNS_GTK_open_imagemenuitem_activate_cb (GtkMenuItem *menuitem,
   GtkBuilder *builder;
   GtkWidget *toplevel;
   GtkFileFilter *ff;
+  GtkFileChooser *fc;
 
   builder =
     GNUNET_GTK_get_new_builder ("gnunet_gns_gtk_zone_open.glade", NULL);
@@ -192,6 +193,14 @@ GNUNET_GNS_GTK_open_imagemenuitem_activate_cb (GtkMenuItem *menuitem,
 
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GNS_GTK_zone_open_filechooserdialog"));
+
+  if (GTK_IS_FILE_CHOOSER(ad))
+  {
+    fc = GTK_FILE_CHOOSER(ad);
+    if (NULL != fc)
+      gtk_file_chooser_set_current_folder(fc, zonekey_directory);
+  }
+
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (menuitem));
   if (GTK_IS_WINDOW (toplevel))
     gtk_window_set_transient_for (GTK_WINDOW (ad), GTK_WINDOW (toplevel));
@@ -236,10 +245,10 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_CRYPTO_rsa_key_free (zone_pkey);
     zone_pkey = NULL;
   }
-  if (NULL != zonefile_directory)
+  if (NULL != zonekey_directory)
   {
-    GNUNET_free (zonefile_directory);
-    zonefile_directory = NULL;
+    GNUNET_free (zonekey_directory);
+    zonekey_directory = NULL;
   }
 }
 
@@ -295,13 +304,13 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   ml = cls;
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (get_configuration (),
-                                                            "namestore",
-                                                            "ZONEFILE_DIRECTORY",
-                                                            &zonefile_directory))
+                                                            "gns",
+                                                            "ZONEKEY_DIRECTORY",
+                                                            &zonekey_directory))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Option `%s' missing in section `%s'\n"),
-                "ZONEFILE_DIRECTORY", "namestore");
+                "ZONEKEY_DIRECTORY", "namestore");
     return;
   }