13 files changed, 345 insertions, 410 deletions

diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index da25ddbc..712c777d 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -30,12 +30,17 @@
 #include "helper.h"
 #include "meta.h"
 #include "collection.h"
+#include <GNUnet/gnunet_collection_lib.h>
 #include <extractor.h>
 
 static GladeXML * metaXML;
 
-void on_collectionDialogMetaDataAddButton_clicked(gpointer dummy,
-                                                  GtkWidget * uploadButton) {
+static struct GE_Context * ectx;
+
+static struct GC_Configuration * cfg;
+
+void on_collectionDialogMetaDataAddButton_clicked_fs(gpointer dummy,
+                                                     GtkWidget * uploadButton) {
   handleMetaDataListUpdate(metaXML,
                            "collectionMetaDataTypeComboBox",            
                            "collectionMetaDataValueEntry",
@@ -43,8 +48,8 @@ void on_collectionDialogMetaDataAddButton_clicked(gpointer dummy,
 }
 
 
-void createCollection_clicked(GtkWidget * dummy1,
-                               GtkWidget * dummy2) {
+void createCollection_clicked_fs(GtkWidget * dummy1,
+                                 GtkWidget * dummy2) {
   const char * collectionName;
   const char * updateIntervalString;
   GtkWidget * w;
@@ -109,12 +114,14 @@ void createCollection_clicked(GtkWidget * dummy1,
     collectionName
       = gtk_entry_get_text(GTK_ENTRY(nameLine));
     root = NULL;
-    if (OK == FSUI_startCollection(ctx,
-                                   gtk_spin_button_get_value_as_int
-                                   (GTK_SPIN_BUTTON(spin)),
-                                   updateInterval,
-                                   collectionName,
-                                   meta)) {
+    if (OK == CO_startCollection(ectx,
+                                 cfg,
+                                 gtk_spin_button_get_value_as_int
+                                 (GTK_SPIN_BUTTON(spin)),
+                                 1000, /* priority */
+                                 updateInterval,
+                                 collectionName,
+                                 meta)) {
       w = glade_xml_get_widget(getMainXML(),
                                "createCollection");
       gtk_widget_set_sensitive(w, FALSE);
@@ -141,11 +148,12 @@ void createCollection_clicked(GtkWidget * dummy1,
   metaXML = NULL;
 }
 
-void deleteCollection_clicked(GtkWidget * dummy1,
-                              GtkWidget * dummy2) {
+void deleteCollection_clicked_fs(GtkWidget * dummy1,
+                                 GtkWidget * dummy2) {
   GtkWidget * w;
 
-  if (OK == FSUI_stopCollection(ctx)) {
+  if (OK == CO_stopCollection(ectx,
+                              cfg)) {
     w = glade_xml_get_widget(getMainXML(),
                              "createCollection");
     gtk_widget_set_sensitive(w, TRUE);
@@ -160,10 +168,14 @@ void deleteCollection_clicked(GtkWidget * dummy1,
   }
 }
 
-void fs_collection_start() {
+void fs_collection_start(struct GE_Context * e,
+                         struct GC_Configuration * c) {
   GtkWidget * w;
 
-  if (NULL != FSUI_getCollection(ctx))
+  ectx = e;
+  cfg = c;
+  if (NULL != CO_getCollection(ectx,
+                               cfg))
     w = glade_xml_get_widget(getMainXML(),
                              "createCollection");
   else
diff --git a/src/plugins/fs/collection.h b/src/plugins/fs/collection.h
index 825db40e..2c8f712c 100644
--- a/src/plugins/fs/collection.h
+++ b/src/plugins/fs/collection.h
@@ -27,7 +27,10 @@
 #ifndef GTK_COLLECTION_H
 #define GTK_COLLECTION_H
 
-void fs_collection_start(void);
+#include <GNUnet/gnunet_util.h>
+
+void fs_collection_start(struct GE_Context * ectx,
+                         struct GC_Configuration * cfg);
 
 void fs_collection_stop(void);
 
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index cc287093..2e645738 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -44,6 +44,10 @@ static DownloadList * head;
 
 static GtkTreeStore * summary;
 
+static struct GE_Context * ectx;
+
+static struct GC_Configuration * cfg;
+
 static int addFilesToDirectory
   (const ECRS_FileInfo * fi,
    const HashCode512 * key,
@@ -59,7 +63,6 @@ static int addFilesToDirectory
   if (isRoot == YES)
     return OK;
   DEBUG_BEGIN();
-  FSUI_trackURI(fi);
   pos = head;
   while (pos != NULL) {
     if (ECRS_equalsUri(uri,
@@ -112,7 +115,7 @@ typedef struct {
   const char * mime;
   char * final_download_destination;
   unsigned int anon;
-  int ret;
+  struct FSUI_SearchList * ret;
 } InitiateDownloadCls;
 
 static void * startSearch(void * cls) {
@@ -120,6 +123,8 @@ static void * startSearch(void * cls) {
 
   idc->ret = FSUI_startSearch(ctx,
                               idc->anon,
+                              1000, /* FIXME: max results */
+                              99 * cronYEARS, /* fixme: timeout */
                               idc->uri);
   return NULL;
 }
@@ -129,6 +134,7 @@ static void * startDownload(void * cls) {
 
   FSUI_startDownload(ctx,
                      idc->anon,
+                     NO, /* FIXME: isRecursive */
                      idc->uri,
                      idc->final_download_destination);
   return NULL;
@@ -189,8 +195,8 @@ static void initiateDownload(GtkTreeModel * model,
          we'll just add it as a new tab for now */
       run_with_save_calls(&startSearch,
                           &idc);
-      if (idc.ret == OK) 
-        openTabForSearch(NULL,
+      if (idc.ret != NULL) 
+        openTabForSearch(idc.ret,
                          idc.uri,
                          idc.anon,
                          0,
@@ -238,11 +244,11 @@ static void initiateDownload(GtkTreeModel * model,
   if (*cname == '\0') /* name ended in '/' - likely directory */
     cname = oname;
   idc.name = cname;
-
-  final_download_dir = getFileName("FS",
-                                   "INCOMINGDIR",
-                                   _("You must specify a directory in the configuration"
-                                     " in section `%s' under `%s'."));
+  GC_get_configuration_value_filename(cfg,
+                                      "FS",
+                                      "INCOMINGDIR",
+                                      "$HOME/gnunet-downloads/",
+                                      &final_download_dir);
   if (strlen(dname) > 0) {
     char * tmp;
     tmp = MALLOC(strlen(final_download_dir) + strlen(dname) + 2);
@@ -301,7 +307,8 @@ static void initiateDownload(GtkTreeModel * model,
     strcat(idc.final_download_destination,
            DIR_SEPARATOR_STR);
   strcat(idc.final_download_destination, dirPath);
-  mkdirp(idc.final_download_destination);
+  disk_directory_create(ectx,
+                        idc.final_download_destination);
   strcat(idc.final_download_destination, idc.name);
   if ( (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '/') ||
        (idc.final_download_destination[strlen(idc.final_download_destination) - 1] == '\\') )
@@ -331,11 +338,11 @@ static void initiateDownload(GtkTreeModel * model,
   if (final_download_dir[strlen(final_download_dir)-1] != DIR_SEPARATOR)
     strcat(list->finalName, DIR_SEPARATOR_STR);
   strcat(list->finalName, dirPath);
-  mkdirp(list->finalName);
+  disk_directory_create(ectx, list->finalName);
   strcat(list->finalName, idc.name);
   head = list;
   size = ECRS_fileSize(idc.uri);
-  size_h = getHumanSize(size);
+  size_h = string_get_fancy_byte_size(size);
   gtk_tree_store_insert(summary,
                         &iiter,
                         NULL,
@@ -395,7 +402,7 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry,
   urid = STRDUP(uris);
   gtk_entry_set_text(GTK_ENTRY(entry),
                      ECRS_URI_PREFIX);
-  idc.uri = ECRS_stringToUri(urid);
+  idc.uri = ECRS_stringToUri(ectx, urid);
   if (idc.uri == NULL) {
     addLogEntry(_("Invalid URI `%s'"), urid);
     FREE(urid);
@@ -412,11 +419,12 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry,
     ECRS_freeUri(idc.uri);
     return;
   }
-  final_download_dir = getFileName("FS",
-                                   "INCOMINGDIR",
-                                   _("You must specify a directory in the configuration"
-                                     " in section `%s' under `%s'."));
-  mkdirp(final_download_dir);
+  GC_get_configuration_value_filename(cfg,
+                                      "FS",
+                                      "INCOMINGDIR",
+                                      "$HOME/gnunet-downloads/",
+                                      &final_download_dir);
+  disk_directory_create(ectx, final_download_dir);
   dname = &uris[strlen(ECRS_URI_PREFIX) + strlen(ECRS_FILE_INFIX)];
   idc.final_download_destination = MALLOC(strlen(final_download_dir) + strlen(dname) + 2);
   strcpy(idc.final_download_destination, final_download_dir);
@@ -434,7 +442,7 @@ void on_statusDownloadURIEntry_editing_done(GtkWidget * entry,
   list->filename = idc.final_download_destination;
   list->finalName = STRDUP(idc.final_download_destination);
   head = list;
-  size_h = getHumanSize(ECRS_fileSize(idc.uri));
+  size_h = string_get_fancy_byte_size(ECRS_fileSize(idc.uri));
   gtk_tree_store_insert(summary,
                         &iiter,
                         NULL,
@@ -507,7 +515,8 @@ void displayDownloadUpdate(const struct ECRS_URI * uri,
                                       &iter));
   }
   meta = NULL;
-  ECRS_listDirectory(data,
+  ECRS_listDirectory(ectx,
+                     data,
                      size,
                      &meta,
                      &addFilesToDirectory,
@@ -528,9 +537,10 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
   DownloadList * pos;
 
   DEBUG_BEGIN();
-  LOG(LOG_DEBUG,
-      "Download '%s' complete\n",
-      filename);
+  GE_LOG(ectx,
+         GE_STATUS | GE_USER | GE_BULK,
+         _("Download '%s' complete.\n"),
+         filename);
   pos = head;
   while (pos != NULL) {
     if (ECRS_equalsUri(uri,
@@ -544,16 +554,20 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
     if ( (pos->rr != NULL) &&
          (gtk_tree_row_reference_valid(pos->rr)) ) { 
       /* update directory view (if applicable!) */
-      if (OK == getFileSize(filename, &size)) {
-        LOG(LOG_DEBUG,
-            "Updating directory view of '%s'\n",
-            filename);
+      if (OK == disk_file_size(ectx,
+                               filename,
+                               &size,
+                               YES)) {
+        GE_LOG(ectx,
+               GE_DEBUG,
+               "Updating directory view of '%s'\n",
+               filename);
 
         meta = NULL;
-        fd = fileopen(filename, O_RDONLY);
-        if (fd == -1) {
-          LOG_FILE_STRERROR(LOG_ERROR, "open", filename);
-        } else {
+        fd = disk_file_open(ectx,
+                            filename, 
+                            O_RDONLY);
+        if (fd != -1) {
           data = MMAP(NULL,
                       size,
                       PROT_READ,
@@ -561,10 +575,14 @@ void displayDownloadComplete(const struct ECRS_URI * uri,
                       fd,
                       0);
           if (data == MAP_FAILED) {
-            LOG_FILE_STRERROR(LOG_ERROR, "mmap", filename);
+            GE_LOG_STRERROR_FILE(ectx,
+                                 GE_ERROR | GE_ADMIN | GE_BULK,
+                                 "mmap",
+                                 filename);
           } else {
             if (data != NULL) {
-              ECRS_listDirectory(data,
+              ECRS_listDirectory(ectx,
+                                 data,
                                  size,
                                  &meta,
                                  &addFilesToDirectory,
@@ -622,28 +640,20 @@ static int delDownloadView(void * cls,
 }
 
 static void * clearCompletedDownloads(void * unused) {
-  FSUI_clearCompletedDownloads(ctx,
-                               &delDownloadView,
-                               NULL);
+  /* FIXME */
   return NULL;
 }
 
-void on_clearCompletedDownloadsButton_clicked(void * unused,
-                                              GtkWidget * clearButton) {
+void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
+                                                 GtkWidget * clearButton) {
   run_with_save_calls(&clearCompletedDownloads,
                       NULL);
 }
 
-struct aDC_closure {
-  struct ECRS_URI * u;
-  char * fn;
-};
-
 static void * shutdownCode(void * c) {
-  struct aDC_closure * cls = c;
+  struct FSUI_DownloadList * pos = c;
   FSUI_stopDownload(ctx,
-                    cls->u,
-                    cls->fn);
+                    pos);
   return NULL;
 }
 
@@ -651,20 +661,21 @@ static void abortDownloadCallback(GtkTreeModel * model,
                                   GtkTreePath * path,
                                   GtkTreeIter * iter,
                                   GtkTreeStore * tree) {
-  struct aDC_closure cls;
+  void * c;
+  struct ECRS_URI * u;
 
-  GNUNET_ASSERT(model == GTK_TREE_MODEL(summary));
+  GE_ASSERT(ectx, model == GTK_TREE_MODEL(summary));
   gtk_tree_model_get(model,
                      iter,
-                     DOWNLOAD_URI, &cls.u,
-                     DOWNLOAD_FILENAME, &cls.fn,
+                     DOWNLOAD_POS, &c,
+                     DOWNLOAD_URI, &u,
                      -1);
   run_with_save_calls(&shutdownCode,
-                      &cls);
+                      c);
   gtk_tree_store_remove(summary,
                         iter);
-  if (cls.u != NULL)
-    ECRS_freeUri(cls.u);
+  if (u != NULL)
+    ECRS_freeUri(u);
 }
 
 void on_abortDownloadButton_clicked(void * unused,
@@ -683,14 +694,14 @@ void on_abortDownloadButton_clicked(void * unused,
   DEBUG_END();
 }
 
-static int addDownloadView(void * cls,
-                           const struct FSUI_DownloadList * pos,
-                           const char * filename,
-                           const struct ECRS_URI * uri,
-                           unsigned long long filesize,
-                           unsigned long long bytesCompleted,
-                           int isRecursive,
-                           unsigned int anonymityLevel) {
+int addDownloadView(struct FSUI_DownloadList * pos,
+                    struct FSUI_DownloadList * ppos,
+                    const char * filename,
+                    const struct ECRS_URI * uri,
+                    unsigned long long filesize,
+                    unsigned long long bytesCompleted,
+                    int isRecursive,
+                    unsigned int anonymityLevel) {
   GtkTreeIter iiter;
   int progress;
   char * uriname;
@@ -712,7 +723,7 @@ static int addDownloadView(void * cls,
           (sname[-1] != '/') &&
           (sname[-1] != '\\') )
     sname--;
-  size_h = getHumanSize(filesize);
+  size_h = string_get_fancy_byte_size(filesize);
   gtk_tree_store_set(summary,
                      &iiter,
                      DOWNLOAD_FILENAME, filename,
@@ -731,12 +742,15 @@ static int addDownloadView(void * cls,
 }
 
 
-void fs_download_start() {
+void fs_download_start(struct GE_Context * e,
+                       struct GC_Configuration * c) {
   GtkWidget * downloadList;
   GtkCellRenderer * renderer;
   GtkTreeViewColumn * column;
   int col;
 
+  ectx = e;
+  cfg = c;
   DEBUG_BEGIN();
   downloadList = glade_xml_get_widget(getMainXML(),
                                       "activeDownloadsList");
@@ -805,10 +819,6 @@ void fs_download_start() {
   gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(downloadList),
                                               col - 1),
                                               TRUE);
-  FSUI_listDownloads(ctx,
-                     NULL,
-                     &addDownloadView,
-                     NULL);
   DEBUG_END();
 }
 
diff --git a/src/plugins/fs/download.h b/src/plugins/fs/download.h
index a897d458..3f194c57 100644
--- a/src/plugins/fs/download.h
+++ b/src/plugins/fs/download.h
@@ -41,7 +41,8 @@ void displayDownloadUpdate(const struct ECRS_URI * uri,
 void displayDownloadComplete(const struct ECRS_URI * uri,
                              const char * filename);
 
-void fs_download_start(void);
+void fs_download_start(struct GE_Context * e,
+                       struct GC_Configuration * c);
 
 void fs_download_stop(void);
 
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index d7889698..44008226 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -36,9 +36,20 @@
 
 struct FSUI_Context * ctx;
 
-static void * saveEventProcessor(void * arg) {
-  const FSUI_Event * event = arg;
+static struct GE_Context * ectx;
 
+static struct GC_Configuration * cfg;
+
+typedef struct {
+  const FSUI_Event * event;
+  void * ret;
+} SEP_Closure;
+
+static void saveEventProcessor(void * arg) {
+  SEP_Closure * cls = arg;
+  const FSUI_Event * event = cls->event;
+  
+  cls->ret = NULL;
   DEBUG_BEGIN();
   switch (event->type) {
   case FSUI_search_result:
@@ -50,10 +61,10 @@ static void * saveEventProcessor(void * arg) {
     GE_LOG(ectx,
            GE_ERROR,
            _("Error while searching: %s\n"),
-           event->data.message);
+           event->data.SearchError.message);
     break;
   case FSUI_download_aborted:
-  case FSUI_download_suspending:
+  case FSUI_download_suspended:
     /* ignore for now */
     break;
   case FSUI_download_progress:
@@ -62,7 +73,7 @@ static void * saveEventProcessor(void * arg) {
                           event->data.DownloadProgress.last_block,
                           event->data.DownloadProgress.last_size);
     break;
-  case FSUI_download_complete:
+  case FSUI_download_completed:
     displayDownloadComplete(event->data.DownloadProgress.uri,
                             event->data.DownloadProgress.filename);
     addLogEntry(_("Download `%s' complete"), 
@@ -76,47 +87,32 @@ static void * saveEventProcessor(void * arg) {
     GE_LOG(ectx,
            GE_ERROR,
            _("Error while downloading: %s\n"),
-           event->data.message);
+           event->data.DownloadError.message);
     break;
   case FSUI_upload_progress:
-    displayUploadUpdate(event->data.UploadProgress.main_filename,
+    displayUploadUpdate(event->data.UploadProgress.uc.cctx,
                         event->data.UploadProgress.filename,
                         event->data.UploadProgress.completed,
                         event->data.UploadProgress.total);
-    displayUploadUpdate(event->data.UploadProgress.main_filename,
-                        event->data.UploadProgress.main_filename,
-                        event->data.UploadProgress.main_completed,
-                        event->data.UploadProgress.main_total);
     break;
-  case FSUI_upload_complete:
-    displayUploadComplete(event->data.UploadComplete.main_filename,
-                          event->data.UploadComplete.filename,
-                          event->data.UploadComplete.uri);
+  case FSUI_upload_completed:
+    displayUploadComplete(event->data.UploadCompleted.uc.cctx,
+                          event->data.UploadCompleted.filename,
+                          event->data.UploadCompleted.uri);
     addLogEntry(_("Upload `%s' complete"), 
-                event->data.UploadComplete.filename);
+                event->data.UploadCompleted.filename);
     gnunetgtk_notify(NOTIFY_NORMAL,
                      _("Upload `%s' complete"), 
-                     event->data.UploadComplete.filename);
+                     event->data.UploadCompleted.filename);
     break;
   case FSUI_upload_error:
     GE_LOG(ectx,
            GE_ERROR,
            _("Error while uploading: %s\n"),
-           event->data.message);
+           event->data.UploadError.message);
     gnunetgtk_notify(NOTIFY_NORMAL,
                      _("Error while uploading `%s'"), 
-                     event->data.message);
-    break;
-  case FSUI_gnunetd_connected:
-    GE_LOG(ectx,
-           GE_INFO,
-           _("Connected to gnunetd.\n"));
-    break;
-  case FSUI_gnunetd_disconnected:
-    GE_LOG(ectx,
-           GE_INFO,
-           _("Disconnected from gnunetd.\n"));
-    addLogEntry(_("Disconnected from gnunetd.\n"));
+                     event->data.UploadError.message);
     break;
   default:
     GE_BREAK(ectx, 0);
@@ -127,23 +123,30 @@ static void * saveEventProcessor(void * arg) {
     break;
   }
   DEBUG_END();
-  return NULL;
 }
 
 /**
  * FSUI event handler.
  */
-static void eventProcessor(void * cls,
-                           const FSUI_Event * event) {
+static void * eventProcessor(void * unused,
+                             const FSUI_Event * event) {
+  SEP_Closure cls;
+  
+  cls.event = event;
+  cls.ret = NULL;
   gtkSaveCall(&saveEventProcessor,
-              (void*) event);
+              &cls);
+  return cls.ret;
 }
 
-void init_fs() {
+void init_fs(struct GE_Context * e,
+             struct GC_Configuration * c) {
   GtkWidget * tab;
   GtkWidget * book;
   gint num;
 
+  ectx = e;
+  cfg = c;
   tab
     = glade_xml_get_widget(getMainXML(),
                            "fsnotebook");
@@ -154,15 +157,18 @@ void init_fs() {
   gtk_notebook_set_current_page(GTK_NOTEBOOK(book), 1);
   gtk_notebook_set_current_page(GTK_NOTEBOOK(book), num);
 
-  ctx = FSUI_start("gnunet-gtk",
+  ctx = FSUI_start(ectx,
+                   cfg,
+                   "gnunet-gtk",
+                   128,
                    YES,
                    &eventProcessor,
                    NULL);
-  fs_collection_start();
-  fs_search_start();
-  fs_download_start();
-  fs_upload_start();
-  fs_namespace_start();
+  fs_collection_start(ectx, cfg);
+  fs_search_start(ectx, cfg);
+  fs_download_start(ectx, cfg);
+  fs_upload_start(ectx, cfg);
+  fs_namespace_start(ectx, cfg);
 }
 
 void done_fs() {
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 5121e9f8..0494a17c 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -68,6 +68,7 @@ enum {
   DOWNLOAD_URI,
   DOWNLOAD_TREEPATH,
   DOWNLOAD_DIRPATH,
+  DOWNLOAD_POS, // NEW!
   DOWNLOAD_NUM
 };
 
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 686256d1..74ed7932 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -438,7 +438,7 @@ char * updateIntervalToString(TIME_T interval) {
     return strdup(_("--sporadic update--"));
   if (interval == ECRS_SBLOCK_UPDATE_NONE)
     return strdup(_("--no update--"));
-  return timeIntervalToFancyString(interval * cronSECONDS);
+  return string_get_fancy_time_interval(interval * cronSECONDS);
 }
 
 int parseTimeInterval(const char * timeSpec,
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index ac4e0ddf..4a3041e5 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -30,6 +30,9 @@
 #include "helper.h"
 #include "meta.h"
 #include "namespace.h"
+#include <GNUnet/gnunet_util_crypto.h>
+#include <GNUnet/gnunet_uritrack_lib.h>
+#include <GNUnet/gnunet_namespace_lib.h>
 #include <extractor.h>
 
 #define UPDATE_CONTENT_LIST_FREQUENCY (5 * cronMINUTES)
@@ -52,6 +55,10 @@ static NamespaceList * head;
 
 static GladeXML * metaXML;
 
+static struct GE_Context * ectx;
+
+static struct GC_Configuration * cfg;
+
 static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
                                       GtkWidget ** anonSpin) {
   GtkWidget * window;
@@ -295,7 +302,7 @@ static int updateView(const ECRS_FileInfo * fi,
   uriString = ECRS_uriToString(fi->uri);
   gtk_list_store_append(GTK_LIST_STORE(model),
                         &iter);
-  size_h = getHumanSize(size);
+  size_h = string_get_fancy_byte_size(size);
   gtk_list_store_set(GTK_LIST_STORE(model),
                      &iter,
                      NAMESPACE_FILENAME, filename,
@@ -353,8 +360,11 @@ static void doUpdateContentList(void * unused) {
                            "availableContentList");
   model
     = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  FSUI_listURIs(&updateView,
-                model);
+  URITRACK_listURIs(ectx,
+                    cfg,
+                    YES,
+                    &updateView,
+                    model);
   DEBUG_END();
 }
 
@@ -451,7 +461,7 @@ static int addNamespaceContentToModel(void * cls,
     date = GN_CTIME(&nextPublicationTime);
 
   freq = updateIntervalToString(publicationFrequency);
-  size_h = getHumanSize(size);
+  size_h = string_get_fancy_byte_size(size);
   gtk_list_store_append(model,
                         &iter);
   gtk_list_store_set(model,
@@ -518,8 +528,9 @@ static int addTabForNamespace(void * unused,
                            list->namespacepage,
                            label);
   gtk_widget_show(notebook);
-  FSUI_listNamespaceContent
-    (ctx,
+  NS_listNamespaceContent
+    (ectx,
+     cfg,
      namespaceName,
      &addNamespaceContentToModel,
      model);
@@ -594,10 +605,13 @@ void create_namespace_clicked(GtkWidget * dummy1,
     nameLine = glade_xml_get_widget(metaXML,
                                     "namespaceNameEntry");
     namespaceName = gtk_entry_get_text(GTK_ENTRY(nameLine));
-    root = FSUI_createNamespace(ctx,
-                                gtk_spin_button_get_value_as_int
-                                (GTK_SPIN_BUTTON(spin)),
-                                namespaceName,
+    root = NS_createNamespace(ectx,
+                              cfg,
+                              gtk_spin_button_get_value_as_int
+                              (GTK_SPIN_BUTTON(spin)),
+                              1000, /* FIXME: priority */
+                              999999, /* FIXME: expiration */
+                              namespaceName,
                                 meta,
                                 keywordURI,
                                 &rootEntry);
@@ -677,7 +691,7 @@ void namespaceDelete_clicked(GtkWidget * dummy1,
     list = list->next;
   }
   if (list == NULL) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     return;
   }
   /* open window to ask for confirmation,
@@ -701,7 +715,9 @@ void namespaceDelete_clicked(GtkWidget * dummy1,
     head = list->next;
   else
     prev->next = list->next;
-  FSUI_deleteNamespace(list->name);
+  NS_deleteNamespace(ectx,
+                     cfg,
+                     list->name);
   FREE(list->name);
   ECRS_freeMetaData(list->meta);
   FREE(list);
@@ -748,18 +764,21 @@ static void initiateUpload(GtkTreeModel * model,
      metadata immediately with the dialog. */
 
   if (dst == NULL) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     return;
   }
-  resultURI = FSUI_addToNamespace(ctx,
-                                  cls->anonymityLevel,
-                                  cls->namespaceName,
-                                  cls->updateInterval,
-                                  cls->lastId,
-                                  &cls->thisId,
-                                  cls->nextId,
-                                  dst,
-                                  meta);
+  resultURI = NS_addToNamespace(ectx,
+                                cfg,
+                                cls->anonymityLevel,
+                                1000, /* FIXME: priority */
+                                999999, /* FIXME: expiration */
+                                cls->namespaceName,
+                                cls->updateInterval,
+                                cls->lastId,
+                                &cls->thisId,
+                                cls->nextId,
+                                dst,
+                                meta);
   if (resultURI != NULL) {
     list = head;
     while ( (list != NULL) &&
@@ -767,7 +786,7 @@ static void initiateUpload(GtkTreeModel * model,
                          list->name)) )
       list = list->next;
     if (list == NULL) {
-      BREAK();
+      GE_BREAK(ectx, 0);
     } else {
       /* update namespace content list! */
       fi.uri = dst;
@@ -834,7 +853,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
   if (FALSE == gtk_tree_selection_get_selected(selection,
                                                NULL,
                                                &iter)) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     return;
   }
   gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)),
@@ -846,7 +865,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
     = glade_xml_get_widget(getMainXML(),
                            "localNamespacesNotebook");
   num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-  GNUNET_ASSERT(num != -1);
+  GE_ASSERT(ectx, num != -1);
   page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
                                   num);
   list = head;
@@ -854,7 +873,7 @@ void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
           (list->namespacepage != page) )
     list = list->next;
   if (list == NULL) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     return;
   }
   cls.namespaceName = list->name;
@@ -979,7 +998,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
   if (FALSE == gtk_tree_selection_get_selected(selection,
                                                NULL,
                                                &iter)) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     return;
   }
   gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)),
@@ -991,7 +1010,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
     = glade_xml_get_widget(getMainXML(),
                            "localNamespacesNotebook");
   num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-  GNUNET_ASSERT(num != -1);
+  GE_ASSERT(ectx, num != -1);
   page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
                                   num);
   list = head;
@@ -999,7 +1018,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
           (list->namespacepage != page) )
     list = list->next;
   if (list == NULL) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     return;
   }
   cls.namespaceName = list->name;
@@ -1023,7 +1042,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
   if (FALSE == gtk_tree_selection_get_selected(selectionNamespace,
                                                NULL,
                                                &iter)) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     return;
   }
   gtk_tree_model_get(list->model,
@@ -1044,7 +1063,7 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
                      next);
   if (OK != enc2hash(next,
                      &cls.thisId)) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     UNREF(metaXML);
     metaXML = NULL;
     return;
@@ -1053,14 +1072,14 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
                      &prevId)) {
     cls.lastId = &prevId;
   } else {
-    BREAK(); /* should not happen, try to continue */
+    GE_BREAK(ectx, 0); /* should not happen, try to continue */
     cls.lastId = NULL;
   }
   nameLine = glade_xml_get_widget(metaXML,
                                   "nextIdentifierEntry");
   if (OK != parseTimeInterval(freq,
                               &cls.updateInterval)) {
-    BREAK();
+    GE_BREAK(ectx, 0);
     cls.updateInterval = ECRS_SBLOCK_UPDATE_SPORADIC;
   }
   if (cls.updateInterval == ECRS_SBLOCK_UPDATE_SPORADIC) {
@@ -1069,12 +1088,14 @@ void on_namespaceUpdateButton_clicked(GtkWidget * dummy1,
   } else {
     EncName updateName;
 
-    if (OK != FSUI_computeNextId(list->name,
-                                 &prevId,
-                                 &cls.thisId,
-                                 cls.updateInterval,
-                                 &nextId)) {
-      BREAK();
+    if (OK != NS_computeNextId(ectx,
+                               cfg,
+                               list->name,
+                               &prevId,
+                               &cls.thisId,
+                               cls.updateInterval,
+                               &nextId)) {
+      GE_BREAK(ectx, 0);
       UNREF(metaXML);
       metaXML = NULL;
       return;
@@ -1167,7 +1188,8 @@ void on_clearAvailableContentButton_clicked(GtkWidget * dummy1,
                            "availableContentList");
   model
     = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  FSUI_clearTrackedURIS();
+  URITRACK_clearTrackedURIS(ectx,
+                            cfg);
   gtkSaveCall(&clearContentList, model);
   updateContentList(NULL);
   DEBUG_END();
@@ -1180,12 +1202,15 @@ void on_trackingCheckButton_toggled(GtkWidget * dummy1,
   trackCheckButton
     = glade_xml_get_widget(getMainXML(),
                            "trackingCheckButton");
-  FSUI_trackURIS(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trackCheckButton)) == TRUE ?
-                 YES : NO);
+  URITRACK_trackURIS(ectx,
+                     cfg,
+                     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trackCheckButton)) == TRUE ?
+                     YES : NO);
 }
 
 
-void fs_namespace_start() {
+void fs_namespace_start(struct GE_Context * e,
+                        struct GC_Configuration * c) {
   GtkWidget * contentList;
   GtkListStore * model;
   GtkCellRenderer * renderer;
@@ -1193,12 +1218,15 @@ void fs_namespace_start() {
   GtkTreeViewColumn * column;
   int col;
 
+  ectx = e;
+  cfg = c;
   DEBUG_BEGIN();
   trackCheckButton
     = glade_xml_get_widget(getMainXML(),
                            "trackingCheckButton");
   gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(trackCheckButton),
-                               FSUI_trackStatus() == YES ? TRUE : FALSE);
+                               URITRACK_trackStatus(ectx,
+                                                    cfg) == YES ? TRUE : FALSE);
 
   contentList
     = glade_xml_get_widget(getMainXML(),
@@ -1263,14 +1291,18 @@ void fs_namespace_start() {
   gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
                                                               col - 1),
                                      TRUE);
+#if 0 
+  /* FIXME: change to event based update approach! */
   addCronJob(&updateContentList,
              0,
              UPDATE_CONTENT_LIST_FREQUENCY,
              NULL);
-  FSUI_listNamespaces(ctx,
-                      YES,
-                      &addTabForNamespace,
-                      NULL);
+#endif
+  NS_listNamespaces(ectx,
+                    cfg,
+                    YES,
+                    &addTabForNamespace,
+                    NULL);
   DEBUG_END();
 }
 
diff --git a/src/plugins/fs/namespace.h b/src/plugins/fs/namespace.h
index c2260f29..50e1b258 100644
--- a/src/plugins/fs/namespace.h
+++ b/src/plugins/fs/namespace.h
@@ -27,7 +27,10 @@
 #ifndef GTK_NAMESPACE_H
 #define GTK_NAMESPACE_H
 
-void fs_namespace_start(void);
+#include <GNUnet/gnunet_util.h>
+
+void fs_namespace_start(struct GE_Context * ectx,
+                        struct GC_Configuration * cfg);
 
 void fs_namespace_stop(void);
 
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index e8f08881..369eff46 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -30,7 +30,8 @@
 #include "fs.h"
 #include "meta.h"
 #include <extractor.h>
-
+#include <GNUnet/gnunet_util_crypto.h>
+#include <GNUnet/gnunet_namespace_lib.h>
 
 
 /**
@@ -43,12 +44,16 @@ typedef struct SL {
   GtkTreeModel * model;
   GtkWidget * anonymityButton;
   struct ECRS_URI * uri;
+  struct FSUI_SearchList * fsui_list; /* FIXME: initialize! */
 } SearchList;
 
 static SearchList * head;
 
 static GtkListStore * summary;
 
+static struct GE_Context * ectx;
+
+static struct GC_Configuration * cfg;
 
 /**
  * Add an entry to the search tree.
@@ -134,7 +139,7 @@ void addEntryToSearchTree(GtkTreeStore * model,
   } else {
     pixbuf = NULL;
   }
-  size_h = getHumanSize(size);
+  size_h = string_get_fancy_byte_size(size);
   gtk_tree_store_set(model,
                      pos,
                      SEARCH_NAME, name,
@@ -244,14 +249,15 @@ void on_namespaceRatingSpinButton_changed(GtkWidget * dummy,
     } else {
       if (encStr != NULL) {
         newrating = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
-        rating = FSUI_rankNamespace(ctx,
-                                    encStr,
-                                    newrating - rating);
+        rating = NS_rankNamespace(ectx,
+                                  cfg,
+                                  encStr,
+                                  newrating - rating);
         if (rating != newrating) {
           /* concurrent modification? */
           gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
                                     rating);
-          BREAK();      
+          GE_BREAK(ectx, 0);    
         }
         gtk_list_store_set(GTK_LIST_STORE(model),
                            &iter,
@@ -321,8 +327,10 @@ void on_searchNamespaceComboBoxEntry_changed(GtkWidget * dummy,
                                 rating);
       gtk_widget_set_sensitive(spin,
                                TRUE);
-      if (OK == FSUI_getNamespaceRoot(encStr,
-                                      &root)) {
+      if (OK == NS_getNamespaceRoot(ectx,
+                                    cfg,
+                                    encStr,
+                                    &root)) {
         hash2enc(&root,
                  &enc);
         keyword
@@ -469,11 +477,11 @@ void displaySearchResult(const ECRS_FileInfo * info,
 }
 
 static void * stopSearch(void * u) {
-  struct ECRS_URI * uri = u;
+  struct FSUI_SearchList * search = u;
 
   DEBUG_BEGIN();
   FSUI_stopSearch(ctx,
-                  uri);
+                  search);
   DEBUG_END();
   return NULL;
 }
@@ -562,7 +570,7 @@ static void closeSearchPage(SearchList * list) {
                                     &iter));
   ECRS_freeUri(list->uri);
   list->uri = NULL;
-  BREAK();
+  GE_BREAK(ectx, 0);
 }
 
 void on_closeSearchButton_clicked(GtkWidget * searchPage,
@@ -587,7 +595,7 @@ void on_closeSearchButton_clicked(GtkWidget * searchPage,
     prev->next = list->next;
 
   run_with_save_calls(&stopSearch,
-                      list->uri);
+                      list->fsui_list);
   closeSearchPage(list);
   FREE(list);
   DEBUG_END();
@@ -690,9 +698,10 @@ static GtkWidget * makeResultFrame(GtkWidget ** treeview,
   gtk_tree_view_column_set_reorderable(column, TRUE);
   gtk_tree_view_column_set_sort_column_id(column, SEARCH_DESC);
   /*gtk_tree_view_column_set_sort_indicator(column, TRUE);*/
-  if (! testConfigurationString("GNUNET-GTK",
-                                "DISABLE-PREVIEWS",
-                                "YES")) {
+  if (YES != GC_get_configuration_value_yesno(cfg,
+                                              "GNUNET-GTK",
+                                              "DISABLE-PREVIEWS",
+                                              NO)) {
     renderer = gtk_cell_renderer_pixbuf_new();
     col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
                                                 -1,
@@ -721,14 +730,17 @@ static GtkWidget * makeResultFrame(GtkWidget ** treeview,
 typedef struct {
   struct ECRS_URI * uri;
   int anon;
+  struct FSUI_SearchList * ret;
 } StartSearchClosure;
 
 static void * startSearch(void * cls) {
   StartSearchClosure * ssc = cls;
 
-  FSUI_startSearch(ctx,
-                   ssc->anon,
-                   ssc->uri);
+  ssc->ret = FSUI_startSearch(ctx,
+                              ssc->anon,
+                              1000, /* FIXME: max results */
+                              99 * cronYEARS, /* FIXME: timeout */
+                              ssc->uri);
   return NULL;
 }
 
@@ -815,7 +827,7 @@ void on_fssearchbutton_clicked(gpointer dummy2,
     strcat(ustring, ns);
     strcat(ustring, "/");
     strcat(ustring, ss);
-    uri = ECRS_stringToUri(ustring);
+    uri = ECRS_stringToUri(ectx, ustring);
     if (uri == NULL) {
       GE_LOG(ectx,
              GE_ERROR | GE_BULK | GE_USER,
@@ -824,14 +836,14 @@ void on_fssearchbutton_clicked(gpointer dummy2,
     }
     FREE(ustring);
   } else {
-    uri = FSUI_parseCharKeywordURI(ss);
+    uri = ECRS_parseCharKeywordURI(ectx, ss);
   }
   if (uri == NULL)
     return;
   if (ns == NULL) {
     tabtxt = STRDUP(ss);
   } else {
-    GNUNET_ASSERT(descStr != NULL);
+    GE_ASSERT(ectx, descStr != NULL);
     tabtxt = MALLOC(strlen(ss) + strlen(descStr) + 2);
     SNPRINTF(tabtxt,
              strlen(ss) + strlen(descStr) + 2,
@@ -899,6 +911,7 @@ void on_fssearchbutton_clicked(gpointer dummy2,
   ssc.uri = uri;
   run_with_save_calls(&startSearch,
                       &ssc);
+  list->fsui_list = ssc.ret;
   FREE(tabtxt);
   DEBUG_END();
 }
@@ -963,6 +976,7 @@ static int addNamespace(void * arg,
   return OK;
 }
 
+#if 0
 /**
  * cron job that periodically updates the model for the
  * namespace selection in the search vbox.
@@ -986,10 +1000,11 @@ static void updateNCBModelSafe(void * unused) {
                      NS_SEARCH_METADATA, NULL,          
                      NS_SEARCH_RATING, 0,
                      -1);
-  FSUI_listNamespaces(ctx,
-                      NO,
-                      &addNamespace,
-                      model);
+  NS_listNamespaces(ectx,
+                    cfg,
+                    NO,
+                    &addNamespace,
+                    model);
   searchNamespaceCB
     = glade_xml_get_widget(getMainXML(),
                            "searchNamespaceComboBoxEntry");
@@ -1006,12 +1021,14 @@ static void updateNCBModelSafe(void * unused) {
 static void updateNCBModel(void * dummy) {
   gtkSaveCall(&updateNCBModelSafe, NULL);
 }
+#endif
+
 
 /**
  * Open a tab for the given search
  * (and display the results).
  */
-int openTabForSearch(void * unused,
+int openTabForSearch(struct FSUI_SearchList * slist,
                      const struct ECRS_URI * uri,
                      unsigned int anonymityLevel,
                      unsigned int resultCount,
@@ -1102,14 +1119,17 @@ int openTabForSearch(void * unused,
   return OK;
 }
 
-void fs_search_start() {
+void fs_search_start(struct GE_Context * e,
+                     struct GC_Configuration * c) {
   GtkWidget * searchCB;
   GtkListStore * model;
   GtkWidget * searchList;
   GtkCellRenderer * renderer;
   GtkTreeViewColumn * column;
   int col;
-
+  
+  ectx = e;
+  cfg = c;
   DEBUG_BEGIN();
   searchCB
     = glade_xml_get_widget(getMainXML(),
@@ -1124,12 +1144,14 @@ void fs_search_start() {
                           GTK_TREE_MODEL(model));
   gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(searchCB),
                                       NS_SEARCH_DESCRIPTION);
+#if 0
+  /* FIXME: replace with event callback! */
   cron_job_add(cron,
                &updateNCBModel,
                0,
                5 * cronMINUTES,
                NULL);
-
+#endif
   searchList = glade_xml_get_widget(getMainXML(),
                                     "activeSearchesSummary");
   summary =
@@ -1173,10 +1195,6 @@ void fs_search_start() {
   gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(GTK_TREE_VIEW(searchList),
                                               col - 1),
                                               TRUE);
-
-  FSUI_listSearches(ctx,
-                    &openTabForSearch,
-                    NULL);
   DEBUG_END();
 }
 
@@ -1185,10 +1203,12 @@ void fs_search_stop() {
   GtkTreeIter iter;
   struct ECRS_URI * u;
 
+#if 0
   cron_job_del(cron,
                &updateNCBModel,
                5 * cronMINUTES,
                NULL);
+#endif
   while (head != NULL) {
     list = head;
     head = head->next;
@@ -1222,8 +1242,8 @@ void fs_search_stop() {
  * This function is a modified version of an Epiphany/Gedit code,
  * part of this work is copyrighted (GPL license) by its authors.
  */
-GtkWidget *buildSearchTabLabel (GtkWidget *searchPage, const char *title)
-{
+GtkWidget *buildSearchTabLabel(GtkWidget *searchPage, 
+                               const char *title) {
   GtkWidget *hbox, *label_hbox, *label_ebox;
   GtkWidget *label, *dummy_label;
   GtkWidget *close_button;
diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index 7cf46b7a..089074c3 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -28,6 +28,7 @@
 #define GTK_SEARCH_H
 
 #include <GNUnet/gnunet_ecrs_lib.h>
+#include <GNUnet/gnunet_fsui_lib.h>
 
 /**
  * Add an entry to the search tree.
@@ -59,13 +60,14 @@ void displaySearchResult(const ECRS_FileInfo * info,
  */
 GtkWidget * getAnonymityButtonFromTM(GtkTreeModel * model);
 
-int openTabForSearch(void * unused,
+int openTabForSearch(struct FSUI_SearchList * list,
                      const struct ECRS_URI * uri,
                      unsigned int anonymityLevel,
                      unsigned int resultCount,
                      const ECRS_FileInfo * results);
 
-void fs_search_start(void);
+void fs_search_start(struct GE_Context * e,
+                     struct GC_Configuration * c);
 
 void fs_search_stop(void);
 
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index a0fa0e14..6cf8b153 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -49,16 +49,17 @@ static GtkTreeStore * summary;
  */
 static GladeXML * metaXML;
 
+static struct GE_Context * ectx;
+
+static struct GC_Configuration * cfg;
+
 /**
  */
-void displayUploadUpdate(const char * mainName,
+void displayUploadUpdate(struct FSUI_UploadList * list,
                          const char * filename,
                          unsigned long long completed,
                          unsigned long long total) {
-  GtkTreeIter iter;
-  GtkTreeIter child;
   int progress;
-  char * name;
 
   DEBUG_BEGIN();
   if (total != 0)
@@ -66,184 +67,22 @@ void displayUploadUpdate(const char * mainName,
   else
     progress = 100;
 
-  if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(GTK_TREE_MODEL(summary),
-                         &iter,
-                         UPLOAD_FILENAME, &name,
-                         -1);
-      if (0 == strcmp(name, filename)) {
-        gtk_tree_store_set(GTK_TREE_STORE(summary),
-                           &iter,
-                           UPLOAD_PROGRESS, progress,
-                           -1);
-        return;
-      }
-      if (0 == strcmp(name, mainName)) {
-        if (gtk_tree_model_iter_children(GTK_TREE_MODEL(summary),
-                                         &child,
-                                         &iter)) {
-          do {  
-            gtk_tree_model_get(GTK_TREE_MODEL(summary),
-                               &child,
-                               UPLOAD_FILENAME, &name,
-                               -1);
-            if (0 == strcmp(name, filename)) {
-              gtk_tree_store_set(GTK_TREE_STORE(summary),
-                                 &child,
-                                 UPLOAD_PROGRESS, progress,
-                                 -1);
-              return;
-            }
-          } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
-                                            &child));   
-        }
-        gtk_tree_store_append(GTK_TREE_STORE(summary),
-                              &child,
-                              &iter);
-        gtk_tree_store_set(GTK_TREE_STORE(summary),
-                           &child,
-                           UPLOAD_FILENAME, filename,
-                           UPLOAD_PROGRESS, progress,
-                           UPLOAD_URISTRING, NULL,
-                           -1);
-        return;
-      }
-    } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
-                                      &iter));
-  }
-  if (0 != strcmp(mainName,
-                  filename)) {
-    gtk_tree_store_append(GTK_TREE_STORE(summary),
-                          &iter,
-                          NULL);
-    gtk_tree_store_set(GTK_TREE_STORE(summary),
-                       &iter,
-                       UPLOAD_FILENAME, mainName,
-                       UPLOAD_PROGRESS, 0,
-                       UPLOAD_URISTRING, NULL,
-                       -1);
-    gtk_tree_store_append(GTK_TREE_STORE(summary),
-                          &child,
-                          &iter);
-    gtk_tree_store_set(GTK_TREE_STORE(summary),
-                       &child,
-                       UPLOAD_FILENAME, filename,
-                       UPLOAD_PROGRESS, progress,
-                       UPLOAD_URISTRING, NULL,
-                       -1);
-  } else {
-    gtk_tree_store_append(GTK_TREE_STORE(summary),
-                          &iter,
-                          NULL);
-    gtk_tree_store_set(GTK_TREE_STORE(summary),
-                       &iter,
-                       UPLOAD_FILENAME, filename,
-                       UPLOAD_PROGRESS, progress,
-                       UPLOAD_URISTRING, NULL,
-                       -1);
-  }
+  /* FIXME! */
   DEBUG_END();
 }
 
 /**
  */
-void displayUploadComplete(const char * mainName,
+void displayUploadComplete(struct FSUI_UploadList * list,
                            const char * filename,
                            const struct ECRS_URI * uri) {
-  GtkTreeIter iter;
-  GtkTreeIter child;
-  char * name;
   char * us;
 
   DEBUG_BEGIN();
   GE_ASSERT(ectx, uri != NULL);
   us = ECRS_uriToString(uri);
   GE_ASSERT(ectx, us != NULL);
-  if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(GTK_TREE_MODEL(summary),
-                         &iter,
-                         UPLOAD_FILENAME, &name,
-                         -1);
-      if (0 == strcmp(name, filename)) {
-        gtk_tree_store_set(GTK_TREE_STORE(summary),
-                           &iter,
-                           UPLOAD_PROGRESS, 100,
-                           UPLOAD_URISTRING, us,
-                           -1);
-        FREE(us);
-        return;
-      }
-      if (0 == strcmp(name, mainName)) {
-        if (gtk_tree_model_iter_children(GTK_TREE_MODEL(summary),
-                                         &child,
-                                         &iter)) {
-          do {  
-            gtk_tree_model_get(GTK_TREE_MODEL(summary),
-                               &child,
-                               UPLOAD_FILENAME, &name,
-                               -1);
-            if (0 == strcmp(name, filename)) {
-              gtk_tree_store_set(GTK_TREE_STORE(summary),
-                                 &child,
-                                 UPLOAD_PROGRESS, 100,
-                                 UPLOAD_URISTRING, us,
-                                 -1);
-              FREE(us);
-              return;
-            }
-          } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
-                                            &child));   
-        }
-        gtk_tree_store_append(GTK_TREE_STORE(summary),
-                              &child,
-                              &iter);
-        gtk_tree_store_set(GTK_TREE_STORE(summary),
-                           &child,
-                           UPLOAD_FILENAME, filename,
-                           UPLOAD_PROGRESS, 100,
-                           UPLOAD_URISTRING, us,
-                           -1);
-        FREE(us);
-        return;
-      }
-    } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
-                                      &iter));
-  }
-  if (0 != strcmp(mainName,
-                  filename)) {
-    gtk_tree_store_append(GTK_TREE_STORE(summary),
-                          &iter,
-                          NULL);
-    gtk_tree_store_set(GTK_TREE_STORE(summary),
-                       &iter,
-                       UPLOAD_FILENAME, mainName,
-                       UPLOAD_PROGRESS, 0,
-                       UPLOAD_URISTRING, NULL,
-                       -1);
-    gtk_tree_store_append(GTK_TREE_STORE(summary),
-                          &child,
-                          &iter);
-    gtk_tree_store_set(GTK_TREE_STORE(summary),
-                       &iter,
-                       UPLOAD_FILENAME, filename,
-                       UPLOAD_PROGRESS, 100,
-                       UPLOAD_URISTRING, NULL,
-                       -1);
-  } else {
-    gtk_tree_store_append(GTK_TREE_STORE(summary),
-                          &iter,
-                          NULL);
-    gtk_tree_store_set(GTK_TREE_STORE(summary),
-                       &iter,
-                       UPLOAD_FILENAME, filename,
-                       UPLOAD_PROGRESS, 100,
-                       UPLOAD_URISTRING, us,
-                       -1);
-  }
+  /* FIXME */
   FREE(us);
   DEBUG_END();
 }
@@ -293,29 +132,24 @@ typedef struct {
   struct ECRS_URI * keywordURI;
   struct ECRS_URI * gkeywordURI;
   struct ECRS_MetaData * meta;
+  struct FSUI_UploadList * fsui_list; // FIXME: use this!
 } UploadClosure;
 
 static void * doUpload(void * cls) {
   UploadClosure * uc = cls;
 
-  if (uc->doRec) {
-    FSUI_uploadAll(ctx,
-                   uc->filename,
-                   uc->anon,
-                   uc->doIndex,
-                   uc->deepIndex,
-                   uc->meta,
-                   uc->gkeywordURI,
-                   uc->keywordURI);
-  } else {
-    FSUI_upload(ctx,
-                uc->filename,
-                uc->anon,
-                uc->doIndex,
-                NO,
-                uc->meta,
-                uc->keywordURI);
-  }
+  uc->fsui_list = FSUI_startUpload(ctx,
+                                   uc->filename,
+                                   (DirectoryScanCallback) &disk_directory_scan,
+                                   ectx,
+                                   uc->anon,
+                                   1000, /* FIXME: priority */
+                                   uc->doIndex,
+                                   YES, /* FIXME: do extract */
+                                   uc->deepIndex,
+                                   uc->meta,
+                                   uc->gkeywordURI,
+                                   uc->keywordURI);
   return NULL;
 }
 
@@ -334,8 +168,12 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
 
   DEBUG_BEGIN();
   extractors = EXTRACTOR_loadDefaultLibraries();
-  config = getConfigurationString("FS",
-                                  "EXTRACTORS");
+  config = NULL;
+  GC_get_configuration_value_string(cfg,
+                                    "FS",
+                                    "EXTRACTORS",
+                                    NULL,
+                                    &config);
   if (config != NULL) {
     extractors = EXTRACTOR_loadConfigLibraries(extractors,
                                                config);
@@ -354,7 +192,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
   dialog = glade_xml_get_widget(metaXML,
                                 "metaDataDialog");
   uc.meta = ECRS_createMetaData();
-  ECRS_extractMetaData(uc.meta,
+  ECRS_extractMetaData(ectx,
+                       uc.meta,
                        uc.filename,
                        extractors);
   EXTRACTOR_removeAll(extractors);
@@ -405,7 +244,8 @@ void on_fsinsertuploadbutton_clicked(gpointer dummy,
     deepIndex = glade_xml_get_widget(getMainXML(),
                                      "deepIndexCheckButton");
     uc.deepIndex = (TRUE == gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(deepIndex))) ? YES : NO;
-    uc.gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX
+    uc.gkeywordURI = ECRS_stringToUri(ectx,
+                                      ECRS_URI_PREFIX
                                       ECRS_SEARCH_INFIX);
     run_with_save_calls(&doUpload,
                         &uc);
@@ -476,7 +316,8 @@ static char * selectFile(const char *oldfilename) {
 
 void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton,
                                                   gpointer dummy) {
-  char *filename, *oldfilename;
+  char * filename;
+  const char *oldfilename;
   GtkWidget * uploadLine;
   GtkWidget * entry;
   GtkListStore * model;
@@ -502,13 +343,16 @@ void on_mainFileSharingInsertBrowseButton_clicked(GtkWidget * browseButton,
 }
 
 
-void fs_upload_start() {
+void fs_upload_start(struct GE_Context * e,
+                     struct GC_Configuration * c) {
   GtkWidget * uploadList;
   GtkWidget * uploadEntry;
   GtkCellRenderer * renderer;
   GtkListStore * model;
   int col;
 
+  ectx = e;
+  cfg = c;
   uploadList = glade_xml_get_widget(getMainXML(),
                                     "activeUploadsList");
   summary =
diff --git a/src/plugins/fs/upload.h b/src/plugins/fs/upload.h
index 1f34b118..d3b418cc 100644
--- a/src/plugins/fs/upload.h
+++ b/src/plugins/fs/upload.h
@@ -29,14 +29,14 @@
 
 /**
  */
-void displayUploadUpdate(const char * mainName,
+void displayUploadUpdate(struct FSUI_UploadList * list,
                          const char * filename,
                          unsigned long long completed,
                          unsigned long long total);
 
 /**
  */
-void displayUploadComplete(const char * mainName,
+void displayUploadComplete(struct FSUI_UploadList * list,
                            const char * filename,
                            const struct ECRS_URI * uri);
 
@@ -54,7 +54,8 @@ void displayUploadResult(const ECRS_FileInfo * info,
                          const struct ECRS_URI * uri,
                          GtkTreeRowReference * row);
 
-void fs_upload_start(void);
+void fs_upload_start(struct GE_Context * e,
+                     struct GC_Configuration * c);
 
 void fs_upload_stop(void);