1 files changed, 55 insertions, 5 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 272c9b1d..83bfcb50 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     (C) 2010, 2011, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -627,6 +627,11 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   struct SearchResult *sr;
   gchar *mime;
   struct DownloadContext *dlc;
+  char *buf;
+  char *tmp;
+  size_t tmplen;
+  char cwd[FILENAME_MAX];
+  char *filename;
 
   GNUNET_assert (tab != NULL);
   tm = gtk_tree_view_get_model (tree_view);
@@ -642,10 +647,52 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
     g_free (mime);
     return;
   }
+
+
+  /* FIXME: we should check if this download is a file in some directory
+     (gtk_tree_model_iter_get_parent) and if so obtain the name under which
+     the directory was stored! */
+  /* Calculate suggested filename; first, pre-pend current working directory */
+  filename = GNUNET_FS_meta_data_suggest_filename (meta);
+  if (NULL != getcwd (cwd, sizeof (cwd)))
+  {
+    if (NULL == filename)
+    {
+      buf = GNUNET_strdup (cwd);
+    }
+    else
+    {
+      GNUNET_asprintf (&tmp, "%s%s%s",
+                       cwd,
+                       DIR_SEPARATOR_STR,
+                       filename);
+      tmplen = strlen (tmp);
+      /* now, if we have a directory, replace trailing '/' with ".gnd" */
+      if (GNUNET_YES ==
+          GNUNET_FS_meta_data_test_for_directory (meta))
+      {
+        if ( (tmp[tmplen-1] == '/') ||
+             (tmp[tmplen-1] == '\\') )
+          tmp[tmplen-1] = '\0';
+        GNUNET_asprintf (&buf,
+                         "%s%s",
+                         tmp,
+                         GNUNET_FS_DIRECTORY_EXT);
+        GNUNET_free (tmp);           
+      }
+      else
+      {
+        buf = tmp;
+      }
+    }
+  }
+  GNUNET_free_non_null (filename);
+
+  /* now setup everything for the save-as dialog */
   dlc = GNUNET_malloc (sizeof (struct DownloadContext));
   dlc->uri = GNUNET_FS_uri_dup (uri);
   dlc->mime = (NULL != mime) ? GNUNET_strdup (mime) : NULL;
-  dlc->filename = GNUNET_FS_meta_data_suggest_filename (meta);
+  dlc->filename = buf;
   dlc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
   dlc->rr = gtk_tree_row_reference_new (tm, path);
   dlc->sr = sr->result;
@@ -1129,7 +1176,8 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
     else
       tab->query_txt = GNUNET_FS_uri_to_string (query);
   }
-  tab->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_tab.glade");
+  tab->builder = GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_search_tab.glade",
+                                             tab);
   tab->ts =
       GTK_TREE_STORE (gtk_builder_get_object
                       (tab->builder,
@@ -1154,7 +1202,7 @@ setup_search (struct GNUNET_FS_SearchContext *sc,
   tab->label =
       GTK_LABEL (gtk_builder_get_object
                  (tab->builder, "_search_result_label_window_label"));
-
+  /* FIXME: connect these signals using glade!!! */
   tab->close_button =
       GTK_WIDGET (gtk_builder_get_object
                   (tab->builder, "_search_result_label_close_button"));
@@ -1660,7 +1708,8 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
       /* create new tab */
       publish_tab = GNUNET_malloc (sizeof (struct PublishTab));
       publish_tab->builder =
-          GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade");
+        GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade",
+                                    publish_tab);
       df = GTK_WINDOW (gtk_builder_get_object
                        (publish_tab->builder, "_publish_frame_window"));
       publish_tab->frame = gtk_bin_get_child (GTK_BIN (df));
@@ -1676,6 +1725,7 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
       gtk_container_remove (GTK_CONTAINER (df), tab_label);
       gtk_widget_destroy (GTK_WIDGET (df));
 
+      /* FIXME: connect these signals using GLADE!!! */
       /* get refs to widgets */
       close_button =
           GTK_WIDGET (gtk_builder_get_object