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

[gnunet]

Author: wachs
Date: 2012-03-13 11:13:51 +0100 (Tue, 13 Mar 2012)
New Revision: 20472

Modified:
   gnunet-gtk/src/gns/gnunet-gns-gtk.c
Log:
- setting default dir


Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-13 10:13:38 UTC (rev 20471)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-03-13 10:13:51 UTC (rev 20472)
@@ -59,7 +59,7 @@
 /**
  * Default directory of zone files as a string.
  */
-static char *zonefile_directory;
+static char *zonekey_directory;
 
 static GtkWidget *main_window;
 
@@ -176,6 +176,7 @@
   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 @@
 
   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 @@
     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 @@
 
   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;
   }