4 files changed, 37 insertions, 9 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index d7ac628e..0ba02840 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -740,6 +740,10 @@ void on_stopDownloadButton_clicked_fs(void * unused,
   ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallDownloadCallback,
+     &FSUI_abortDownload);
+  ggc_tree_selection_selected_foreach
+    (selection,
+     &fsuiCallDownloadCallback,
      &FSUI_stopDownload);
 }
 
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index ccd0584c..3163d92c 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -59,6 +59,7 @@ saveEventProcessor(void * cls) {
   switch (event->type) {
     /* search events */
   case FSUI_search_started:
+    printf("FSUI: search started\n");
     ret = fs_search_started(event->data.SearchStarted.sc.pos,
                             event->data.SearchStarted.searchURI,
                             event->data.SearchStarted.anonymityLevel,
@@ -66,31 +67,39 @@ saveEventProcessor(void * cls) {
                             NULL);
     break;
   case FSUI_search_result:
+    printf("FSUI: search result\n");
     fs_search_result_received(event->data.SearchResult.sc.cctx,
                               &event->data.SearchResult.fi,
                               event->data.SearchResult.searchURI);
     break;
   case FSUI_search_error:
+    printf("FSUI: search error\n");
     fs_search_aborted(event->data.SearchError.sc.cctx);
     break;
   case FSUI_search_aborted:
+    printf("FSUI: search aborted\n");
     fs_search_aborted(event->data.SearchAborted.sc.cctx);
     break;
   case FSUI_search_completed:
+    printf("FSUI: search completed\n");
     // FIXME...
     fs_search_aborted(event->data.SearchCompleted.sc.cctx);
     break;
   case FSUI_search_suspended:
+    printf("FSUI: search suspended\n");
     fs_search_aborted(event->data.SearchSuspended.sc.cctx);
     break;
   case FSUI_search_resumed:
+    printf("FSUI: search resumed\n");
     ret = fs_search_started(event->data.SearchResumed.sc.pos,
                             event->data.SearchResumed.searchURI,
                             event->data.SearchResumed.anonymityLevel,
                             event->data.SearchResumed.fisSize,
                             event->data.SearchResumed.fis);
+    break;
   case FSUI_search_stopped:
-    fs_search_aborted(event->data.SearchError.sc.cctx);
+    printf("FSUI: search stopped\n");
+    fs_search_stopped(event->data.SearchStopped.sc.cctx);
     break;
 
 
@@ -99,10 +108,10 @@ saveEventProcessor(void * cls) {
     fs_download_aborted(event->data.DownloadAborted.dc.cctx);
     break;
   case FSUI_download_error:
-    fs_download_aborted(event->data.DownloadAborted.dc.cctx);
+    fs_download_aborted(event->data.DownloadError.dc.cctx);
     break;
   case FSUI_download_suspended:
-    fs_download_stopped(event->data.DownloadAborted.dc.cctx);
+    fs_download_stopped(event->data.DownloadSuspended.dc.cctx);
     break;
   case FSUI_download_progress:
     fs_download_update(event->data.DownloadProgress.dc.cctx,
@@ -114,7 +123,7 @@ saveEventProcessor(void * cls) {
     fs_download_completed(event->data.DownloadCompleted.dc.cctx);
     break;
   case FSUI_download_stopped:
-    fs_download_stopped(event->data.DownloadCompleted.dc.cctx);
+    fs_download_stopped(event->data.DownloadStopped.dc.cctx);
     break;
   case FSUI_download_started:
     ret = fs_download_started(event->data.DownloadStarted.dc.pos,
@@ -129,8 +138,8 @@ saveEventProcessor(void * cls) {
     break;
   case FSUI_download_resumed:
     ret = fs_download_started(event->data.DownloadResumed.dc.pos,
-                              event->data.DownloadStarted.dc.pcctx,
-                              event->data.DownloadStarted.dc.sctx,
+                              event->data.DownloadResumed.dc.pcctx,
+                              event->data.DownloadResumed.dc.sctx,
                               event->data.DownloadResumed.total,
                               event->data.DownloadResumed.anonymityLevel,
                               &event->data.DownloadResumed.fi,
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 669477f6..f062dc88 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -318,10 +318,10 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
     = glade_xml_new(getGladeFileName(),
                     "searchTabLabelWindow",
                     PACKAGE_NAME);
+  connectGladeWithPlugins(list->labelXML);
   list->tab_label 
     = extractMainWidgetFromWindow(list->labelXML,
                                   "searchTabLabelWindow");
-
   /* process existing results */
   for (i=0;i<resultCount;i++)
     fs_search_result_received(list,
@@ -385,6 +385,7 @@ static void freeIterSubtree(GtkTreeModel * tree,
  * Update views accordingly.
  */
 void fs_search_aborted(SearchList * list) {
+  printf("search aborted\n");
   /* FIXME: show aborted status somehow! */
 }
 
@@ -616,6 +617,7 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
   SearchList * list;
   struct FCBC fcbc;
 
+  printf("close button clicked\n");
   list = search_head;
   while (list != NULL) {
     if ( (list->searchpage == searchPage) ||
@@ -624,10 +626,13 @@ void on_closeSearchButton_clicked_fs(GtkWidget * searchPage,
     list = list->next;
   }
   GE_ASSERT(ectx, list != NULL);
-  fcbc.method = &FSUI_stopSearch;
+  fcbc.method = &FSUI_abortSearch;
   fcbc.argument = list->fsui_list;
   run_with_save_calls(&fsui_callback,
                       &fcbc);
+  fcbc.method = &FSUI_stopSearch;
+  run_with_save_calls(&fsui_callback,
+                      &fcbc);
 }
 
 /**
@@ -637,6 +642,7 @@ void on_abortSearchButton_clicked_fs(GtkWidget * searchPage,
                                      GtkWidget * closeButton) {
   SearchList * list;
 
+  printf("abort button clicked\n");
   list = search_head;
   while (list != NULL) {
     if (list->searchpage == searchPage)
@@ -661,10 +667,13 @@ static void stopSearch(GtkTreeModel * model,
                      SEARCH_SUMMARY_INTERNAL, &s,
                      -1);
   if (s != NULL) {
-    fcbc.method = &FSUI_stopSearch;
+    fcbc.method = &FSUI_abortSearch;
     fcbc.argument = s->fsui_list;
     run_with_save_calls(&fsui_callback,
                         &fcbc);
+    fcbc.method = &FSUI_stopSearch;
+    run_with_save_calls(&fsui_callback,
+                        &fcbc);
   }
 }
 
@@ -675,6 +684,7 @@ void on_closeSearchSummaryButton_clicked_fs(GtkWidget * closeButton,
                                             GtkWidget * treeview) {
   GtkTreeSelection * selection;
 
+  printf("stop summary button clicked\n");  
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
   ggc_tree_selection_selected_foreach
     (selection,
@@ -709,6 +719,7 @@ void on_abortSearchSummaryButton_clicked_fs(GtkWidget * closeButton,
                                             GtkWidget * treeview) {
   GtkTreeSelection * selection;
 
+  printf("abort summary button clicked\n");  
   selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
   ggc_tree_selection_selected_foreach
     (selection,
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index c742bd13..71c3083a 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -496,6 +496,10 @@ void on_stopUploadButton_clicked_fs(void * unused,
   ggc_tree_selection_selected_foreach
     (selection,
      &fsuiCallUploadCallback,
+     &FSUI_abortUpload);
+  ggc_tree_selection_selected_foreach
+    (selection,
+     &fsuiCallUploadCallback,
      &FSUI_stopUpload);
 }