1 files changed, 56 insertions, 83 deletions

diff --git a/src/fs/gnunet-fs-gtk_download-save-as.c b/src/fs/gnunet-fs-gtk_download-save-as.c
index 8cf3b1de..63b711cd 100644
--- a/src/fs/gnunet-fs-gtk_download-save-as.c
+++ b/src/fs/gnunet-fs-gtk_download-save-as.c
@@ -34,10 +34,10 @@ struct DownloadAsDialogContext
 {
 
   /**
-   * Download context for which this dialog determines the
+   * Download entry for which this dialog determines the
    * filename (and other options).
    */
-  struct DownloadContext *dc;
+  struct DownloadEntry *de;
 
   /**
    * Builder for the dialog.
@@ -53,21 +53,24 @@ struct DownloadAsDialogContext
 
 
 /**
- * Free resources associated with the given download context.
+ * Free resources associated with the given download entry.
  *
- * @param dc context to free
+ * @param de context to free
  */
-static void
-save_as_dialog_free_download_context (struct DownloadContext *dc)
+void
+GNUNET_FS_GTK_free_download_entry (struct DownloadEntry *de)
 {
-  if (NULL != dc->rr)
-    gtk_tree_row_reference_free (dc->rr);
-  GNUNET_free_non_null (dc->filename);
-  if (NULL != dc->meta)
-    GNUNET_CONTAINER_meta_data_destroy (dc->meta);
-  if (NULL != dc->uri)
-    GNUNET_FS_uri_destroy (dc->uri);
-  GNUNET_free (dc);  
+  GNUNET_assert (NULL == de->dc);
+  if (NULL != de->sr)
+  {
+    GNUNET_assert (de->sr->download == de); 
+    de->sr->download = NULL;
+  }
+  GNUNET_free_non_null (de->filename);
+  if (NULL != de->meta)
+    GNUNET_CONTAINER_meta_data_destroy (de->meta);
+  GNUNET_FS_uri_destroy (de->uri);
+  GNUNET_free (de);  
 }
 
 
@@ -87,7 +90,7 @@ GNUNET_GTK_save_as_dialog_delete_event_cb (GtkWidget * widget, GdkEvent * event,
 {
   struct DownloadAsDialogContext *dlc = user_data;
 
-  save_as_dialog_free_download_context (dlc->dc);
+  GNUNET_FS_GTK_free_download_entry (dlc->de);
   g_object_unref (G_OBJECT (dlc->builder));
   GNUNET_free (dlc);
   return FALSE;
@@ -108,37 +111,36 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
                                        gpointer user_data)
 {
   struct DownloadAsDialogContext *dlc = user_data;
-  struct DownloadContext *dc;
+  struct DownloadEntry *de;
   GtkToggleButton *cb;
 
-  dc = dlc->dc;
-
+  de = dlc->de;
   if (GTK_RESPONSE_OK != response_id)
   {
-    save_as_dialog_free_download_context (dc);
+    GNUNET_FS_GTK_free_download_entry (de);
     gtk_widget_destroy (GTK_WIDGET (dialog));
     g_object_unref (G_OBJECT (dlc->builder));
     GNUNET_free (dlc);
     return;
   }
-  GNUNET_free_non_null (dc->filename);
-  dc->filename =
+  GNUNET_free_non_null (de->filename);
+  de->filename =
       GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dlc->dialog));
   cb = GTK_TOGGLE_BUTTON (gtk_builder_get_object
                           (dlc->builder, "GNUNET_GTK_save_as_recursive_check_button"));
-  dc->is_recursive =
+  de->is_recursive =
       (TRUE ==
        gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (cb))) ? GNUNET_YES :
       GNUNET_NO;
-  dc->anonymity =
-      gtk_spin_button_get_value (GTK_SPIN_BUTTON
-                                 (gtk_builder_get_object
-                                  (dlc->builder,
-                                   "GNUNET_GTK_save_as_dialog_anonymity_spin_button")));
+  de->anonymity =
+    (uint32_t) gtk_spin_button_get_value (GTK_SPIN_BUTTON
+                                          (gtk_builder_get_object
+                                           (dlc->builder,
+                                            "GNUNET_GTK_save_as_dialog_anonymity_spin_button")));
   gtk_widget_destroy (GTK_WIDGET (dialog));
   g_object_unref (G_OBJECT (dlc->builder));
   GNUNET_free (dlc);
-  GNUNET_FS_GTK_download_context_start_download (dc);
+  GNUNET_FS_GTK_download_context_start_download (de);
 }
 
 
@@ -147,23 +149,23 @@ GNUNET_GTK_save_as_dialog_response_cb (GtkDialog * dialog,
  * continutation when the dialog is complete.  Will release the 'dc'
  * resources if the dialog is cancelled.
  *
- * @param dc download context for the file/directory 
+ * @param de download context for the file/directory 
  */
 void
-GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
+GNUNET_FS_GTK_open_download_as_dialog (struct DownloadEntry *de)
 {
   struct DownloadAsDialogContext *dlc;
   GtkWidget *cb;
 
   dlc = GNUNET_malloc (sizeof (struct DownloadAsDialogContext));
-  dlc->dc = dc;
+  dlc->de = de;
   dlc->builder =
     GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_download_as_dialog.glade",
                                 dlc);
   if (NULL == dlc->builder)
   {
     GNUNET_break (0);
-    save_as_dialog_free_download_context (dc);
+    GNUNET_FS_GTK_free_download_entry (de);
     GNUNET_free (dlc);
     return;
   }
@@ -174,18 +176,18 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
      set recursive 'default' value based on what the 'dc' tells us */
   cb = GTK_WIDGET (gtk_builder_get_object
                    (dlc->builder, "GNUNET_GTK_save_as_recursive_check_button"));
-  if (GNUNET_FS_meta_data_test_for_directory (dc->meta))
+  if (GNUNET_FS_meta_data_test_for_directory (de->meta))
     gtk_widget_set_sensitive (cb, TRUE);  
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cb),
-                                dc->is_recursive);   
+                                de->is_recursive);   
 
   /* initialize filename based on filename from 'dc' */
-  if (NULL != dc->filename)
+  if (NULL != de->filename)
   {
     char *dirname;
     char *basename;
 
-    dirname = GNUNET_strdup (dc->filename);
+    dirname = GNUNET_strdup (de->filename);
     basename = (char *) GNUNET_STRINGS_get_short_name (dirname);
     /* basename now points into 'dirname'; cut 'dirname' off at the '/' before basename */
     if (basename > dirname)
@@ -194,7 +196,7 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
     /* FIXME: remove following lines after testing... */
     fprintf (stderr,
              "Splitting `%s' into `%s' + `%s' for file chooser dialog.\n",
-             dc->filename,
+             de->filename,
              dirname,
              basename);
 
@@ -214,74 +216,45 @@ GNUNET_FS_GTK_open_download_as_dialog (struct DownloadContext *dc)
  * respective tree model and trigger a start of the download using the
  * FS-API.
  *
- * @param dc download context of the download to execute
+ * @param de download context of the download to execute
  */
 void
-GNUNET_FS_GTK_download_context_start_download (struct DownloadContext *dc)
+GNUNET_FS_GTK_download_context_start_download (struct DownloadEntry *de)
 {
   enum GNUNET_FS_DownloadOptions opt;
   struct GNUNET_FS_Handle *fs;
-  struct DownloadEntry *de;
   uint64_t len;
-  GtkTreeIter iter;
-  GtkTreePath *path;
 
-  de = GNUNET_malloc (sizeof (struct DownloadEntry));
-  de->uri = dc->uri;
-  dc->uri = NULL;
-  de->meta = dc->meta;
-  de->tab = dc->tab;
-  dc->meta = NULL;
-  if (NULL != dc->rr)
-  {
-    de->rr = gtk_tree_row_reference_copy (dc->rr);
-    path = gtk_tree_row_reference_get_path (de->rr);
-    if  ( (NULL != path) &&
-          (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->tab->ts), &iter, path)) )
-    {
-      /* Store filename and anonymity as specified by the user.
-       * These will be re-used when this is a directory, and the user
-       * downloads its children.
-       */
-      gtk_tree_store_set (de->tab->ts, &iter, 15, dc->filename, 16, dc->anonymity, -1);
-    } 
-    else
-    {
-      /* We could not find the referenced row in the search tab; this is
-         conceivable as the search tab might have been closed by the 
-         user while the 'save as' dialog was open.  In this case, this
-         is equivalent to having no search, so we drop the (now invalid)
-         'sr' reference */
-      dc->sr = NULL;
-    }
-    if (NULL != path)
-      gtk_tree_path_free (path);
-  }
   fs = GNUNET_FS_GTK_get_fs_handle ();
   opt = GNUNET_FS_DOWNLOAD_OPTION_NONE;
-  if (dc->is_recursive)
+  if (de->is_recursive)
     opt |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
   len = GNUNET_FS_uri_chk_get_file_size (de->uri);
-  if (NULL != dc->sr)
+  if (NULL != de->sr)
   {
     GNUNET_break (NULL !=
-                  GNUNET_FS_download_start_from_search (fs, dc->sr,
-                                                        dc->filename,
+                  GNUNET_FS_download_start_from_search (fs, 
+                                                        de->sr->result,
+                                                        de->filename,
                                                         NULL /* tempname */ ,
                                                         0 /* offset */ ,
-                                                        len, dc->anonymity, opt,
+                                                        len, 
+                                                        de->anonymity, opt,
                                                         de));
   }
   else
   {
     GNUNET_break (NULL !=
-                  GNUNET_FS_download_start (fs, de->uri, NULL /* meta */ ,
-                                            dc->filename, NULL /* tempname */ ,
+                  GNUNET_FS_download_start (fs, 
+                                            de->uri, 
+                                            de->meta,
+                                            de->filename, NULL /* tempname */ ,
                                             0 /* offset */ ,
-                                            len, dc->anonymity, opt, de,
-                                            NULL /* parent download ctx */ ));
+                                            len, 
+                                            de->anonymity, opt, 
+                                            de,
+                                            (NULL != de->pde) ? de->pde->dc : NULL));
   }
-  save_as_dialog_free_download_context (dc);
 }