1 files changed, 21 insertions, 31 deletions

diff --git a/src/fs/gnunet-fs-gtk-main_window_file_publish.c b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
index bf113ca6..ca9a1500 100644
--- a/src/fs/gnunet-fs-gtk-main_window_file_publish.c
+++ b/src/fs/gnunet-fs-gtk-main_window_file_publish.c
@@ -984,7 +984,7 @@ cancel_scan (struct AddDirClientContext *adcc)
   if (adcc->ds != NULL)
   {
     /* Still scanning - signal the scanner to finish */
-    GNUNET_FS_directory_scan_finish (adcc->ds, GNUNET_NO);
+    GNUNET_FS_directory_scan_abort (adcc->ds);
     result = GNUNET_NO;
   }
   if (adcc->directory_scan_result != NULL)
@@ -1039,17 +1039,18 @@ directory_trim_complete (void *cls,
   }
 }
 
-static int
+static void
 directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
-    const char *filename, int is_directory,
-    enum GNUNET_FS_DirScannerProgressUpdateReason reason)
+                   const char *filename, int is_directory,
+                   enum GNUNET_FS_DirScannerProgressUpdateReason reason)
 {
   struct AddDirClientContext *adcc = cls;
   char *s;
+
   gtk_progress_bar_pulse (adcc->progress_dialog_bar);
   switch (reason)
   {
-    case GNUNET_FS_DIRSCANNER_NEW_FILE:
+    case GNUNET_FS_DIRSCANNER_FILE_START:
       if (filename != NULL)
       {
         if (is_directory)
@@ -1071,7 +1072,7 @@ directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
         GNUNET_free (s);
       }
       break;
-    case GNUNET_FS_DIRSCANNER_ASKED_TO_STOP:
+    case GNUNET_FS_DIRSCANNER_INTERNAL_ERROR:
       if (filename != NULL)
       {
         GNUNET_asprintf (&s,
@@ -1083,43 +1084,32 @@ directory_scan_cb (void *cls, struct GNUNET_FS_DirScanner *ds,
       else
         insert_progress_dialog_text (adcc, _("Scanner is stopping.\n"));
       break;
-    case GNUNET_FS_DIRSCANNER_SHUTDOWN:
-      insert_progress_dialog_text (adcc, _("Client is shutting down.\n"));
-      break;
     case GNUNET_FS_DIRSCANNER_FINISHED:
       insert_progress_dialog_text (adcc, _("Scanner has finished.\n"));
       break;
-    case GNUNET_FS_DIRSCANNER_PROTOCOL_ERROR:
-      insert_progress_dialog_text (adcc,
-          _("There was a failure communicating with the scanner.\n"));
-      adcc->keep = 1;
+    case GNUNET_FS_DIRSCANNER_ALL_COUNTED:
+      // FIXME...
       break;
-    default:
+    case GNUNET_FS_DIRSCANNER_SUBTREE_COUNTED:
+      // FIXME...
+      break;
+    case GNUNET_FS_DIRSCANNER_EXTRACT_FINISHED:
+      // FIXME...
       GNUNET_asprintf (&s,_("Got unknown scanner update with filename `%s'.\n"),
           filename);
       insert_progress_dialog_text (adcc, s);
       GNUNET_free (s);
+      adcc->directory_scan_intermediary_result = GNUNET_FS_directory_scan_get_result (ds);
+      GNUNET_FS_share_tree_trim (adcc->directory_scan_intermediary_result);
+      // FIXME...
+      directory_trim_complete (adcc, NULL);      
+      adcc->ds = NULL;
       adcc->keep = 1;
       break;
   }
-  if ((filename == NULL && GNUNET_FS_DIRSCANNER_FINISHED)
-      || reason == GNUNET_FS_DIRSCANNER_PROTOCOL_ERROR
-      || reason == GNUNET_FS_DIRSCANNER_SHUTDOWN)
-  {
-    /* Any of this causes us to try to clean up the scanner */
-    adcc->directory_scan_intermediary_result = GNUNET_FS_directory_scan_cleanup (ds);
-    adcc->pmc = GNUNET_FS_trim_share_tree (adcc->directory_scan_intermediary_result,
-      &directory_trim_complete, adcc);
-
-    adcc->ds = NULL;
-    /* FIXME: change the tree processor to be able to free untrimmed trees
-     * right here instead of waiting for trimming to complete, if we need to
-     * cancel everything.
-     */
-  }
-  return 0;
 }
 
+
 void
 scan_file_or_directory (struct MainPublishingDialogContext *ctx, gchar *filename,
     struct GNUNET_FS_BlockOptions *bo, int do_index)
@@ -1131,7 +1121,7 @@ scan_file_or_directory (struct MainPublishingDialogContext *ctx, gchar *filename
   adcc->ctx = ctx;
   GNUNET_CONTAINER_DLL_insert_tail (ctx->adddir_head, ctx->adddir_tail, adcc);
   adcc->ds = GNUNET_FS_directory_scan_start (filename,
-      GNUNET_NO, NULL, directory_scan_cb, adcc);
+      GNUNET_NO, NULL, &directory_scan_cb, adcc);
   adcc->directory_scan_bo = *bo;
   adcc->directory_scan_do_index = do_index;