1 files changed, 27 insertions, 70 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 163d103c..e00668a0 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -676,102 +676,59 @@ fs_summary_stop ()
 
 }
 
+static void 
+init_cron_job(void * arg)
+{
+  GtkWidget * tab = arg;
+
+  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk",
+                           8, /* FIXME: allow user to configure download parallelism */
+                           GNUNET_YES, &eventProcessor, NULL);
+  GNUNET_GTK_save_call((GNUNET_ThreadMainFunction) &gtk_widget_show,
+                       tab);
+}
+
 void
 init_fs (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
 {
   GtkWidget *tab;
-  GtkWidget *book;
-  gint num;
+  struct GNUNET_CronManager * cron;
 
   ectx = e;
   cfg = c;
   GNUNET_CO_init (ectx, cfg);
-  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
-  gtk_widget_show (tab);
-  book =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainnotebook");
-  num = gtk_notebook_get_current_page (GTK_NOTEBOOK (book));
-  gtk_notebook_set_current_page (GTK_NOTEBOOK (book), 1);
-  gtk_notebook_set_current_page (GTK_NOTEBOOK (book), num);
   fs_summary_start ();
   fs_collection_start ();
   fs_namespace_start ();
-  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8,  /* FIXME: allow user to configure download parallelism */
-                           GNUNET_YES, &eventProcessor, NULL);
-}
-
-static void *
-hide_save_call (void *arg)
-{
-  GtkWidget *tab;
-
   tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
-  gtk_widget_hide (tab);
-  return NULL;
+  cron = GNUNET_GTK_get_cron_manager();
+  GNUNET_cron_add_job(cron, &init_cron_job, 0, 0, tab);
 }
 
 static void *
 cleanup_save_call (void *arg)
 {
+  GtkWidget *tab = arg;
+
   fs_summary_stop ();
   fs_namespace_stop ();
+  gtk_widget_hide(tab);
   return NULL;
 }
 
 void
 done_fs ()
 {
-  GNUNET_GTK_save_call (&hide_save_call, NULL);
-  GNUNET_FSUI_stop (ctx);
-  GNUNET_GTK_save_call (&cleanup_save_call, NULL);
-  GNUNET_CO_done ();
-}
-
-
-const char *
-getColorCode (enum GNUNET_URITRACK_STATE state)
-{
-  if (state & (GNUNET_URITRACK_DIRECTORY_ADDED))
-    return "blue";
-  if (state & (GNUNET_URITRACK_INSERTED || GNUNET_URITRACK_INDEXED))
-    return "cyan";
-  if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
-      (0 == (state &
-             (GNUNET_URITRACK_DOWNLOAD_COMPLETED |
-              GNUNET_URITRACK_DOWNLOAD_ABORTED))))
-    return "yellow";
-  if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
-    return "springgreen";
-  if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
-    return "red";
-  if (state &
-      (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
-    return "gray";
-  return NULL;
-}
-
+  struct GNUNET_CronManager * cron;
+  GtkWidget *tab;
 
-const char *
-getStatusName (enum GNUNET_URITRACK_STATE state)
-{
-  if (state & (GNUNET_URITRACK_DIRECTORY_ADDED))
-    return _("added");
-  if (state & (GNUNET_URITRACK_INSERTED || GNUNET_URITRACK_INDEXED))
-    return _("shared");
-  if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
-      (0 == (state &
-             (GNUNET_URITRACK_DOWNLOAD_COMPLETED |
-              GNUNET_URITRACK_DOWNLOAD_ABORTED))))
-    return _("started");
-  if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
-    return _("completed");
-  if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
-    return _("aborted");
-  if (state &
-      (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
-    return "";
-  return "";
+  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
+  cron = GNUNET_GTK_get_cron_manager();
+  GNUNET_cron_del_job(cron, &init_cron_job, 0, tab);
+  if (ctx != NULL)
+    GNUNET_FSUI_stop (ctx);
+  GNUNET_GTK_save_call (&cleanup_save_call, tab);
+  GNUNET_CO_done ();
 }
 
-
 /* end of fs.c */