3 files changed, 38 insertions, 10 deletions

diff --git a/src/fs/gnunet-fs-gtk.conf b/src/fs/gnunet-fs-gtk.conf
deleted file mode 100644
index cdb23843..00000000
--- a/src/fs/gnunet-fs-gtk.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[gnunet-fs-gtk]
-MAX_PARALLEL_DOWNLOADS = 128
-MAX_PARALLEL_REQUESTS = 100000
-
-[uri]
-fs = gnunet-fs-gtk
diff --git a/src/fs/gnunet-fs-gtk.conf.in b/src/fs/gnunet-fs-gtk.conf.in
new file mode 100644
index 00000000..027f3b0f
--- /dev/null
+++ b/src/fs/gnunet-fs-gtk.conf.in
@@ -0,0 +1,8 @@
+[gnunet-fs-gtk]
+MAX_PARALLEL_DOWNLOADS = 128
+MAX_PARALLEL_REQUESTS = 100000
+@ENABLE_ON_W32@ DEFAULT_DOWNLOAD_DIRECTORY = "~/Documents/Downloads"
+@ENABLE_ON_UNIX@ DEFAULT_DOWNLOAD_DIRECTORY = "~/Downloads"
+
+[uri]
+fs = gnunet-fs-gtk
diff --git a/src/fs/gnunet-fs-gtk_event-handler.c b/src/fs/gnunet-fs-gtk_event-handler.c
index 6ea99b89..e2a6918c 100644
--- a/src/fs/gnunet-fs-gtk_event-handler.c
+++ b/src/fs/gnunet-fs-gtk_event-handler.c
@@ -340,20 +340,46 @@ clear_metadata_display ()
  * This should get the default download directory (so that GNUnet
  * won't offer the user to download files to the 'bin' subdirectory,
  * or whatever is the cwd).  Returns NULL on failure (such as
- * non-existend directory).  Should also preserve the last setting (so
+ * non-existing directory).  
+ * TODO: Should also preserve the last setting (so
  * if the user saves files somewhere else, next time we default to
  * somewhere else, at least until application restart, or maybe even
  * between application restarts).
  *
  * Fills the 'buffer' up to 'size' bytes, returns a pointer to it.
+ * Buffer will be NUL-terminated, if not NULL.
  */
 static char *
 get_default_download_directory (char *buffer, size_t size)
 {
-  /* FIXME-FEATURE: implement... */
-  return NULL;
-}
+  const struct GNUNET_CONFIGURATION_Handle *cfg;
+  char *dirname;
+  size_t dirname_len;
+  size_t copy_bytes;
+
+  cfg = GNUNET_FS_GTK_get_configuration ();
 
+  if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gnunet-fs-gtk",
+                                                           "DEFAULT_DOWNLOAD_DIRECTORY",
+                                                           &dirname))
+    return NULL;
+
+  if (GNUNET_YES != GNUNET_DISK_directory_test ((const char *) dirname))
+  {
+    GNUNET_free (dirname);
+    return NULL;
+  }
+
+  dirname_len = strlen (dirname);
+  if (dirname_len >= size)
+    copy_bytes = size - 1;
+  else
+    copy_bytes = dirname_len;
+  memcpy (buffer, dirname, copy_bytes);
+  buffer[copy_bytes] = '\0';
+  GNUNET_free (dirname);
+  return buffer;
+}
 
 /**
  * Called recursively to build a suggested filename by prepending