1 files changed, 18 insertions, 49 deletions

diff --git a/src/fs/gnunet-fs-gtk-download.c b/src/fs/gnunet-fs-gtk-download.c
index e3ee68c4..dc5b2310 100644
--- a/src/fs/gnunet-fs-gtk-download.c
+++ b/src/fs/gnunet-fs-gtk-download.c
@@ -35,9 +35,8 @@ struct DownloadAsDialogContext
   struct DownloadContext *dc;
 };
 
-
-static void
-free_download_context (struct DownloadContext *dc)
+void
+GNUNET_GTK_save_as_dialog_free_download_context (struct DownloadContext *dc)
 {
   if (NULL != dc->rr)
     gtk_tree_row_reference_free (dc->rr);
@@ -50,7 +49,6 @@ free_download_context (struct DownloadContext *dc)
   GNUNET_free (dc);  
 }
 
-
 gboolean
 GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
                                            gpointer user_data)
@@ -58,12 +56,7 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
   struct DownloadAsDialogContext *dlc = user_data;
   GtkBuilder *builder;
   struct DownloadContext *dc;
-  enum GNUNET_FS_DownloadOptions opt;
-  struct GNUNET_FS_Handle *fs;
-  struct DownloadEntry *de;
   GtkWidget *cb;
-  uint32_t anonymity;
-  uint64_t len;
 
   if (dlc == NULL)
   {
@@ -76,7 +69,7 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
                    (builder, "GNUNET_GTK_save_as_recursive_check_button"));
   if (GTK_RESPONSE_OK != dlc->response)
   {
-    free_download_context (dc);
+    GNUNET_GTK_save_as_dialog_free_download_context (dc);
     g_object_unref (G_OBJECT (dlc->builder));
     GNUNET_free (dlc);
     return FALSE;
@@ -88,50 +81,16 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
       (TRUE ==
        gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cb))) ? GNUNET_YES :
       GNUNET_NO;
-  fs = GNUNET_FS_GTK_get_fs_handle ();
-  opt = GNUNET_FS_DOWNLOAD_OPTION_NONE;
-  if (dc->is_recursive)
-    opt |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
-  anonymity =
+  dc->anonymity =
       gtk_spin_button_get_value (GTK_SPIN_BUTTON
                                  (gtk_builder_get_object
                                   (builder,
                                    "GNUNET_GTK_save_as_dialog_anonymity_spin_button")));
-  len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
   g_object_unref (G_OBJECT (builder));
 
-  de = GNUNET_malloc (sizeof (struct DownloadEntry));
-  de->uri = dc->uri;
-  dc->uri = NULL;
-  de->meta = dc->meta;
-  dc->meta = NULL;
-  if (dc->rr != NULL)
-  {
-    /* We're going to free "dc" very soon */
-    de->rr = gtk_tree_row_reference_copy (dc->rr);
-    de->ts = GTK_TREE_STORE (gtk_tree_row_reference_get_model (dc->rr));
-  }
-  if (dc->sr != NULL)
-  {
-    GNUNET_break (NULL !=
-                  GNUNET_FS_download_start_from_search (fs, dc->sr,
-                                                        dc->filename,
-                                                        NULL /* tempname */ ,
-                                                        0 /* offset */ ,
-                                                        len, anonymity, opt,
-                                                        de));
-  }
-  else
-  {
-    GNUNET_break (NULL !=
-                  GNUNET_FS_download_start (fs, de->uri, NULL /* meta */ ,
-                                            dc->filename, NULL /* tempname */ ,
-                                            0 /* offset */ ,
-                                            len, anonymity, opt, de,
-                                            NULL /* parent download ctx */ ));
-  }
-  free_download_context (dc);
   GNUNET_free (dlc);
+
+  dc->cb (dc);
   return FALSE;
 }
 
@@ -168,7 +127,7 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
   if (builder == NULL)
   {
     GNUNET_break (0);
-    free_download_context (dc);
+    GNUNET_GTK_save_as_dialog_free_download_context (dc);
     GNUNET_free (dlc);
     return;
   }
@@ -181,7 +140,17 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
   ad = GTK_WIDGET (gtk_builder_get_object
                    (builder, "GNUNET_GTK_save_as_dialog"));
   if (dc->filename != NULL)
-    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), dc->filename);
+  {
+    char *dirname;
+    char *basename;
+    dirname = GNUNET_strdup (dc->filename);
+    basename = (char *) GNUNET_STRINGS_get_short_name (dirname);
+    if (basename > dirname)
+      basename[-1] = '\0';
+    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (ad), dirname);
+    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (ad), basename);
+    GNUNET_free (dirname);
+  }
   dlc->builder = builder;
   dlc->dialog = ad;
   dlc->response = 0;