1 files changed, 16 insertions, 11 deletions

diff --git a/src/fs.c b/src/fs.c
index 7f177bdc..114efe0f 100644
--- a/src/fs.c
+++ b/src/fs.c
@@ -38,35 +38,40 @@ static gint saveEventProcessor(SaveCall * call) {
 
   event = (const FSUI_Event *) call->args;
   switch (event->type) {
-  case search_result:
+  case FSUI_search_result:
     displaySearchResult(&event->data.SearchResult.fi,
                         event->data.SearchResult.searchURI,
                         NULL);
     break;
-  case search_error:
+  case FSUI_search_error:
     LOG(LOG_ERROR,
         _("Error while searching: %s\n"),
         event->data.message);
     break;
-  case download_progress:
+  case FSUI_download_aborted:
+    /* ignore for now */
+    break;
+  case FSUI_download_progress:
     displayDownloadUpdate(event->data.DownloadProgress.uri,
-                          event->data.DownloadProgress.completed);
+                          event->data.DownloadProgress.completed,
+                          event->data.DownloadProgress.last_block,
+                          event->data.DownloadProgress.last_size);
     /* FIXME: 
        if directory, also update search view! */
     break;
-  case download_complete:
+  case FSUI_download_complete:
     displayDownloadComplete(event->data.DownloadProgress.uri,
                             event->data.DownloadProgress.filename);
     /* FIXME: 
        if directory, also update search view! */
     break;
-  case download_error:
+  case FSUI_download_error:
     BREAK();
     LOG(LOG_ERROR,
         _("Error while downloading: %s\n"),
         event->data.message);
     break;
-  case upload_progress:
+  case FSUI_upload_progress:
     displayUploadUpdate(event->data.UploadProgress.main_filename,
                         event->data.UploadProgress.filename,
                         event->data.UploadProgress.completed,
@@ -76,21 +81,21 @@ static gint saveEventProcessor(SaveCall * call) {
                         event->data.UploadProgress.main_completed,
                         event->data.UploadProgress.main_total);
     break;
-  case upload_complete:
+  case FSUI_upload_complete:
     displayUploadComplete(event->data.UploadComplete.main_filename,
                           event->data.UploadComplete.filename,
                           event->data.UploadComplete.uri);
     break;
-  case upload_error:
+  case FSUI_upload_error:
     LOG(LOG_ERROR,
         _("Error while uploading: %s\n"),
         event->data.message);
     break;
-  case gnunetd_connected:
+  case FSUI_gnunetd_connected:
     LOG(LOG_MESSAGE,
         _("Connected to gnunetd.\n"));
     break;
-  case gnunetd_disconnected:
+  case FSUI_gnunetd_disconnected:
     LOG(LOG_MESSAGE,
         _("Disconnected from gnunetd.\n"));
     break;