1 files changed, 44 insertions, 11 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index b58bb5ef..b77615d6 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -639,6 +639,18 @@ void on_statusDownloadURIEntry_editing_done_fs(GtkWidget * entry,
   FREE(urid);
 }
 
+struct FCBC {
+  int (*method)(struct FSUI_Context * ctx,
+                struct FSUI_DownloadList * list);
+  struct FSUI_DownloadList * argument;
+};
+
+static void * fsui_callback(void * cls) {
+  struct FCBC * fcbc = cls;
+  fcbc->method(ctx,
+               fcbc->argument);
+  return NULL;
+}
 
 static void 
 clearCompletedDownloadCallback(GtkTreeModel * model,
@@ -646,6 +658,7 @@ clearCompletedDownloadCallback(GtkTreeModel * model,
                                GtkTreeIter * iter,
                                gpointer unused) {
   DownloadList * dl;
+  struct FCBC fcbc;
 
   GE_ASSERT(ectx,
             model == GTK_TREE_MODEL(download_summary));
@@ -653,9 +666,12 @@ clearCompletedDownloadCallback(GtkTreeModel * model,
                      iter,
                      DOWNLOAD_INTERNAL, &dl,
                      -1);
-  if (dl->has_terminated)
-    FSUI_stopDownload(ctx,
-                      dl->fsui_list);
+  if (dl->has_terminated) {
+    fcbc.method = &FSUI_stopDownload;
+    fcbc.argument = dl->fsui_list;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
+  }
 }
 
 void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
@@ -673,11 +689,12 @@ void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
 }
 
 static void 
-abortDownloadCallback(GtkTreeModel * model,
-                      GtkTreePath * path,
-                      GtkTreeIter * iter,
-                      gpointer unused) {
+fsuiCallDownloadCallback(GtkTreeModel * model,
+                         GtkTreePath * path,
+                         GtkTreeIter * iter,
+                         gpointer fsui_call) {
   DownloadList * dl;
+  struct FCBC fcbc;
 
   GE_ASSERT(ectx,
             model == GTK_TREE_MODEL(download_summary));
@@ -685,8 +702,10 @@ abortDownloadCallback(GtkTreeModel * model,
                      iter,
                      DOWNLOAD_INTERNAL, &dl,
                      -1);
-  FSUI_abortDownload(ctx,
-                     dl->fsui_list);
+  fcbc.method = fsui_call;
+  fcbc.argument = dl->fsui_list;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 void on_abortDownloadButton_clicked_fs(void * unused,
@@ -699,8 +718,22 @@ void on_abortDownloadButton_clicked_fs(void * unused,
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
   gtk_tree_selection_selected_foreach
     (selection,
-     &abortDownloadCallback,
-     NULL);
+     &fsuiCallDownloadCallback,
+     &FSUI_abortDownload);
+}
+
+void on_stopDownloadButton_clicked_fs(void * unused,
+                                      GtkWidget * clearButton) {
+  GtkTreeSelection * selection;
+  GtkWidget * downloadList;
+
+  downloadList = glade_xml_get_widget(getMainXML(),
+                                      "activeDownloadsList");
+  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
+  gtk_tree_selection_selected_foreach
+    (selection,
+     &fsuiCallDownloadCallback,
+     &FSUI_stopDownload);
 }
 
 /* end of download.c */