1 files changed, 15 insertions, 6 deletions

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,