1 files changed, 2 insertions, 65 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 32852aef..607e5813 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -909,69 +909,6 @@ get_suggested_filename_anonymity (GtkTreeModel *tm, GtkTreeIter *iter, int top,
     return NULL;
 }
 
-static void
-open_download_as_callback (struct DownloadContext *dc)
-{
-  enum GNUNET_FS_DownloadOptions opt;
-  struct GNUNET_FS_Handle *fs;
-  struct DownloadEntry *de;
-  uint64_t len;
-
-  GtkTreeIter iter;
-  GtkTreePath *path;
-
-  fs = GNUNET_FS_GTK_get_fs_handle ();
-  opt = GNUNET_FS_DOWNLOAD_OPTION_NONE;
-  if (dc->is_recursive)
-    opt |= GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE;
-  len = GNUNET_FS_uri_chk_get_file_size (dc->uri);
-
-  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));
-
-    path = gtk_tree_row_reference_get_path (de->rr);
-    GNUNET_assert (NULL != path);
-    if (gtk_tree_model_get_iter (GTK_TREE_MODEL (de->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->ts, &iter, 15, dc->filename, 16, dc->anonymity, -1);
-    }
-    gtk_tree_path_free (path);
-
-  }
-  if (dc->sr != NULL)
-  {
-    GNUNET_break (NULL !=
-                  GNUNET_FS_download_start_from_search (fs, dc->sr,
-                                                        dc->filename,
-                                                        NULL /* tempname */ ,
-                                                        0 /* offset */ ,
-                                                        len, dc->anonymity, opt,
-                                                        de));
-  }
-  else
-  {
-    GNUNET_break (NULL !=
-                  GNUNET_FS_download_start (fs, de->uri, NULL /* meta */ ,
-                                            dc->filename, NULL /* tempname */ ,
-                                            0 /* offset */ ,
-                                            len, dc->anonymity, opt, de,
-                                            NULL /* parent download ctx */ ));
-  }
-  GNUNET_GTK_save_as_dialog_free_download_context (dc);
-}
-
 /**
  * Tell FS to start a download.  Begins by opening the
  * "save as" window.
@@ -1086,10 +1023,10 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
   dc->anonymity = anonymity;
   dc->is_recursive = sdc->recursive;
   dc->tab = tab;
-  dc->cb = &open_download_as_callback;
+  dc->cb = &GNUNET_FS_GTK_default_open_download_as_callback;
   if (local_parents && have_a_suggestion)
     /* Skip the dialog, call directly */
-    open_download_as_callback (dc);
+    GNUNET_FS_GTK_default_open_download_as_callback (dc);
   else
     GNUNET_FS_GTK_open_download_as_dialog (dc);
 }