16 files changed, 294 insertions, 253 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 28518fae..01a26825 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -90,8 +90,6 @@ static Plugin *plugin;
 
 static void *shutdown_function;
 
-static struct GNUNET_GE_Context *ectx;
-
 static struct GNUNET_GC_Configuration *cfg;
 
 static struct GNUNET_CronManager *cron;
@@ -234,7 +232,7 @@ connector (const gchar * handler_name,
       if ((module == NULL) ||
           (TRUE != g_module_symbol (module, handler_name, &method)))
         {
-          GNUNET_GE_LOG (ectx,
+          GNUNET_GE_LOG (NULL,
                          GNUNET_GE_WARNING | GNUNET_GE_DEVELOPER |
                          GNUNET_GE_IMMEDIATE,
                          _("Failed to find handler for `%s'\n"),
@@ -265,7 +263,7 @@ loadPlugin (const char *name)
   struct GNUNET_PluginHandle *lib;
   InitCall init;
 
-  lib = GNUNET_plugin_load (ectx, "libgnunetgtkmodule_", name);
+  lib = GNUNET_plugin_load (NULL, "libgnunetgtkmodule_", name);
   if (lib == NULL)
     return;
   p = GNUNET_malloc (sizeof (Plugin));
@@ -275,7 +273,7 @@ loadPlugin (const char *name)
   plugin = p;
   init = GNUNET_plugin_resolve_function (lib, "init_", GNUNET_NO);
   if (init != NULL)
-    init (ectx, cfg);
+    init (NULL, cfg);
 }
 
 static void
@@ -330,21 +328,19 @@ unloadPlugin (void *p)
 }
 
 void
-GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *e,
-                                      struct GNUNET_GC_Configuration *c,
+GNUNET_GTK_initialize_common_library (struct GNUNET_GC_Configuration *c,
                                       void *callback)
 {
   char *load;
   char *path;
   char *filename;
 
-  ectx = e;
   cfg = c;
   shutdown_function = callback;
   sclock = GNUNET_mutex_create (GNUNET_YES);
   mainThread = GNUNET_thread_get_self ();
   saveCallsUp = GNUNET_YES;
-  cron = GNUNET_cron_create (ectx);
+  cron = GNUNET_cron_create (NULL);
 
   /* load the interface */
   path = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
@@ -364,7 +360,7 @@ GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *e,
 
   mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGE_NAME);
   if (mainXML == NULL)
-    GNUNET_GE_DIE_STRERROR_FILE (ectx,
+    GNUNET_GE_DIE_STRERROR_FILE (NULL,
                                  GNUNET_GE_FATAL | GNUNET_GE_USER |
                                  GNUNET_GE_IMMEDIATE, "glade_xml_new",
                                  gladeFile);
@@ -463,7 +459,7 @@ GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
   cls.arg = arg;
   doneThread = GNUNET_thread_create (&shutdownCode, &cls, 64 * 1024);
   if (doneThread == NULL)
-    GNUNET_GE_DIE_STRERROR (ectx,
+    GNUNET_GE_DIE_STRERROR (NULL,
                             GNUNET_GE_FATAL | GNUNET_GE_ADMIN |
                             GNUNET_GE_BULK, "pthread_create");
   if (!GNUNET_thread_test_self (mainThread))
@@ -521,7 +517,7 @@ GNUNET_GTK_notify (int type, const char *message, ...)
       if (!notify_init ("gnunet-gtk"))
         {
           once = 1;
-          GNUNET_GE_LOG (ectx,
+          GNUNET_GE_LOG (NULL,
                          GNUNET_GE_WARNING | GNUNET_GE_BULK | GNUNET_GE_USER |
                          GNUNET_GE_ADMIN,
                          _("Could not initialize libnotify\n"));
@@ -557,7 +553,7 @@ GNUNET_GTK_notify (int type, const char *message, ...)
       if (!notify_notification_show (libnotify, NULL))
         {
           once = 1;
-          GNUNET_GE_LOG (ectx,
+          GNUNET_GE_LOG (NULL,
                          GNUNET_GE_WARNING | GNUNET_GE_USER | GNUNET_GE_ADMIN
                          | GNUNET_GE_BULK,
                          _("Could not send notification via libnotify\n"));
diff --git a/src/common/logging.c b/src/common/logging.c
index 1777e45d..355b4f3b 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -30,48 +30,17 @@
 #include <glib.h>
 #include <gmodule.h>
 
-static GtkWidget *infoWindow;
-
 static GtkWidget *infoWindowTextView;
 
-static GladeXML *statusXML;
-
 static void
 init ()
 {
-  GtkWidget *button;
-
-  if (statusXML != NULL)
+  if (infoWindowTextView != NULL)
     return;
-  statusXML
-    =
-    glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow",
-                   PACKAGE_NAME);
-  infoWindow = glade_xml_get_widget (statusXML, "statusWindow");
   infoWindowTextView
-    = glade_xml_get_widget (statusXML, "messageWindowTextView");
-  button = glade_xml_get_widget (statusXML, "messageWindowCloseButton");
-  GNUNET_GTK_connect_glade_with_plugins (statusXML);
-
-  g_signal_connect_data (infoWindow,
-                         "delete-event",
-                         G_CALLBACK (&gtk_widget_hide_on_delete),
-                         NULL, NULL, 0);
-  g_signal_connect_data (button,
-                         "clicked",
-                         G_CALLBACK (&gtk_widget_hide_on_delete),
-                         infoWindow, NULL, G_CONNECT_SWAPPED);
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML(),
+                            "messageWindowTextView");
 }
-
-/**
- * Closure for doInfoMessage.
- */
-typedef struct
-{
-  int doPopup;
-  char *note;
-} InfoMessage;
-
 /**
  * Do not track more than MAX messages
  */
@@ -83,49 +52,40 @@ typedef struct
 static void *
 doInfoMessage (void *args)
 {
-  const InfoMessage *info = args;
+  char * note = args;
   GtkTextIter iter;
   GtkTextBuffer *buffer;
   GtkTextIter end;
 
   init ();
-  if (info->doPopup == GNUNET_YES)
-    gtk_widget_show (infoWindow);
   buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (infoWindowTextView));
-  gtk_text_buffer_get_iter_at_offset (buffer, &iter, -1);
-  gtk_text_buffer_insert (buffer, &iter, info->note, -1);
+  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
+  gtk_text_buffer_insert (buffer, &iter, note, -1);
   if (gtk_text_buffer_get_line_count (buffer) >= MAX_LINES)
     {
-      gtk_text_buffer_get_iter_at_line (buffer, &iter, MAX_LINES - 1);
-      gtk_text_buffer_get_iter_at_line (buffer, &end, MAX_LINES);
+      gtk_text_buffer_get_iter_at_line (buffer, &iter, MAX_LINES-1);
+      gtk_text_buffer_get_iter_at_line (buffer, &end, -1);
       gtk_text_buffer_delete (buffer, &iter, &end);
     }
   return NULL;
 }
 
-void
-GNUNET_GTK_hide_info_window()
-{
-  gtk_widget_hide (infoWindow);
-}
-
 /**
  * Appends a message to the info window
  *
  * @param doPopup do we open the window, GNUNET_YES or GNUNET_NO
  */
 void
-GNUNET_GTK_show_info_message (int doPopup, const char *format, ...)
+GNUNET_GTK_show_info_message (const char *format, ...)
 {
   va_list args;
-  InfoMessage info;
+  gchar * note;
 
   va_start (args, format);
-  info.note = g_strdup_vprintf (format, args);
+  note = g_strdup_vprintf (format, args);
   va_end (args);
-  info.doPopup = doPopup;
-  GNUNET_GTK_save_call (&doInfoMessage, &info);
-  g_free (info.note);
+  GNUNET_GTK_save_call (&doInfoMessage, note);
+  g_free (note);
 }
 
 static void *
@@ -169,8 +129,8 @@ GNUNET_GTK_add_log_entry (const char *txt, ...)
   va_start (args, txt);
   note = g_strdup_vprintf (txt, args);
   va_end (args);
-  GNUNET_GTK_show_info_message (GNUNET_NO, note);
-  GNUNET_GTK_save_call (&saveAddLogEntry, (void *) note);
+  GNUNET_GTK_save_call (&doInfoMessage, note);
+  GNUNET_GTK_save_call (&saveAddLogEntry, note);
   g_free (note);
 }
 
@@ -178,12 +138,7 @@ static void
 ge_gtk_log_handler (void *ctx,
                     GNUNET_GE_KIND kind, const char *date, const char *msg)
 {
-  int popUp;
-
-  popUp = GNUNET_NO;
-  if ((kind & (GNUNET_GE_FATAL | GNUNET_GE_ERROR | GNUNET_GE_WARNING)) > 0)
-    popUp = GNUNET_YES;
-  GNUNET_GTK_show_info_message (popUp, "%s: %s", date, msg);
+  GNUNET_GTK_show_info_message ("%s: %s", date, msg);
 }
 
 struct GNUNET_GE_Context *
@@ -197,13 +152,4 @@ GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask)
   return myLog;
 }
 
-void __attribute__ ((destructor)) GNUNET_GTK_common_ltdl_fini ()
-{
-  if (statusXML != NULL)
-    {
-      gtk_widget_destroy (infoWindow);
-      infoWindow = NULL;
-      UNREF (statusXML);
-      statusXML = NULL;
-    }
-}
+/* end of logging.c */
diff --git a/src/core/main.c b/src/core/main.c
index 5eedb1e8..78e29adf 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -119,7 +119,7 @@ main (int argc, char *const *argv)
   bind_textdomain_codeset ("GNUnet", "UTF-8");
   bind_textdomain_codeset ("gnunet-gtk", "UTF-8");
 #endif
-  GNUNET_GTK_initialize_common_library (ectx, cfg, &GNUNET_GTK_main_quit);
+  GNUNET_GTK_initialize_common_library (cfg, &GNUNET_GTK_main_quit);
   /* configure GTK logging */
   GNUNET_GC_get_configuration_value_string (cfg,
                                             "LOGGING",
@@ -140,7 +140,6 @@ main (int argc, char *const *argv)
   dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
   gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), dataDir);
   GNUNET_free (dataDir);
-  GNUNET_GTK_hide_info_window();
   gtk_window_maximize (GTK_WINDOW (root));
   gtk_widget_show (root);
   gtk_window_present (GTK_WINDOW (root));
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index d95f8cec..d70009f6 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -44,8 +44,7 @@
 #endif
 
 
-void GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *ectx,
-                                           struct GNUNET_GC_Configuration
+void GNUNET_GTK_initialize_common_library (struct GNUNET_GC_Configuration
                                            *cfg, void *callback);
 
 void GNUNET_GTK_shutdown_plugins (void);
@@ -79,7 +78,7 @@ GtkStatusIcon *GNUNET_GTK_get_trayIcon (void);
  * @param doPopup if GNUNET_YES, the info window will
  *   be opened
  */
-void GNUNET_GTK_show_info_message (int doPopup, const char *format, ...);
+void GNUNET_GTK_show_info_message (const char *format, ...);
 
 /**
  * Appends a log entry to the info window
@@ -90,9 +89,6 @@ void GNUNET_GTK_show_info_message (int doPopup, const char *format, ...);
  */
 void GNUNET_GTK_add_log_entry (const char *txt, ...);
 
-void
-GNUNET_GTK_hide_info_window(void);
-
 struct GNUNET_GE_Context *GNUNET_GTK_create_gtk_logger (GNUNET_GE_KIND mask);
 
 #define GNUNET_GTK_NOTIFY_LEVEL_LOW 0
diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 1c3b4538..0cab7e52 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -47,21 +47,38 @@ static struct GNUNET_GE_Context *ectx;
 static struct GNUNET_GC_Configuration *cfg;
 
 /**
+ * Do the actual update (in event thread).
+ */
+static void *
+updateAppModelSafe (void *arg)
+{
+  GtkWidget *w;
+  GtkListStore *model = arg;
+
+  w =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "applicationList");
+  gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
+  gtk_tree_selection_set_mode (gtk_tree_view_get_selection
+                               (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
+  return NULL;
+}
+
+/**
  * cron job that periodically updates the model for the
  * application list.
  */
-static void *
-updateAppModelSafe (void *unused)
+static void
+updateAppModel (void *dummy)
 {
   struct GNUNET_ClientServerConnection *sock;
-  GtkWidget *w;
-  GtkListStore *model;
   GtkTreeIter iter;
   char *apps;
   char *next;
   char *pos;
   char *desc;
-
+  GtkListStore *model;
+  
   model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
   apps = NULL;
   sock = GNUNET_client_connection_create (ectx, cfg);
@@ -102,21 +119,9 @@ updateAppModelSafe (void *unused)
       while (next != NULL);
       GNUNET_free (apps);
     }
-  w =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "applicationList");
-  gtk_tree_view_set_model (GTK_TREE_VIEW (w), GTK_TREE_MODEL (model));
-  gtk_tree_selection_set_mode (gtk_tree_view_get_selection
-                               (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
-  g_object_unref (model);
   GNUNET_client_connection_destroy (sock);
-  return NULL;
-}
-
-static void
-updateAppModel (void *dummy)
-{
-  GNUNET_GTK_save_call (&updateAppModelSafe, NULL);
+  GNUNET_GTK_save_call (&updateAppModelSafe, model);
+  g_object_unref (model);
 }
 
 
@@ -166,7 +171,6 @@ doUpdateMenus (void *arg)
         isLocal = FALSE;
       GNUNET_free (host);
     }
-  updateAppModelSafe (NULL);
   if (ret == 0)
     {
       canStart = 0;
@@ -238,15 +242,24 @@ doUpdateMenus (void *arg)
   return NULL;
 }
 
+/**
+ * Cron job that checks if the daemon is running.
+ */
 static void
 cronCheckDaemon (void *dummy)
 {
+  static int last = -1;
   int ret;
 
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     ret = 1;
   else
     ret = 0;
+  if (last != ret)
+    {
+      updateAppModel(NULL);
+      last = ret;
+    }
   GNUNET_GTK_save_call (&doUpdateMenus, &ret);
 }
 
@@ -269,7 +282,10 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   gtk_widget_set_sensitive (launchEntry, FALSE);
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     {
-      cronCheckDaemon (NULL);
+      GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                              &cronCheckDaemon,
+                              15 * GNUNET_CRON_SECONDS,
+                              NULL);
       return;
     }
   else
@@ -309,7 +325,10 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
                   GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
                 }
               g_free (fn);
-              cronCheckDaemon (NULL);
+              GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                                      &cronCheckDaemon,
+                                      15 * GNUNET_CRON_SECONDS,
+                                      NULL);
               return;
             }
           else
@@ -329,7 +348,10 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       if (fn != NULL)
         g_free (fn);
-      cronCheckDaemon (NULL);
+      GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                              &cronCheckDaemon,
+                              15 * GNUNET_CRON_SECONDS,
+                              NULL);
     }
 }
 
@@ -368,7 +390,10 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
         }
       GNUNET_client_connection_destroy (sock);
     }
-  cronCheckDaemon (NULL);
+  GNUNET_cron_advance_job(GNUNET_GTK_get_cron_manager (),
+                          &cronCheckDaemon,
+                          15 * GNUNET_CRON_SECONDS,
+                          NULL);
 }
 
 void
@@ -449,7 +474,7 @@ init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
   GNUNET_free (daemon_config);
 
   cron = GNUNET_GTK_get_cron_manager ();
-  GNUNET_cron_add_job (cron, &cronCheckDaemon, 0, 15 * GNUNET_CRON_SECONDS,
+  GNUNET_cron_add_job (cron, &cronCheckDaemon, 2 * GNUNET_CRON_SECONDS, 15 * GNUNET_CRON_SECONDS,
                        NULL);
   GNUNET_cron_add_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES,
                        5 * GNUNET_CRON_MINUTES, NULL);
diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
index b00f8dcf..c8050b53 100644
--- a/src/plugins/fs/Makefile.am
+++ b/src/plugins/fs/Makefile.am
@@ -21,6 +21,7 @@ libgnunetgtkmodule_fs_la_SOURCES = \
   namespace_create.c \
   namespace_search.c namespace_search.h \
   search.c search.h \
+  status.c status.h \
   download.c download.h \
   upload.c upload.h
 libgnunetgtkmodule_fs_la_LIBADD = \
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index 838d7644..067dce3c 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -133,13 +133,11 @@ deleteCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
         glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                               "deleteCollection");
       gtk_widget_set_sensitive (w, FALSE);
-      GNUNET_GTK_show_info_message (GNUNET_NO, _("Collection stopped.\n"));
+      GNUNET_GTK_show_info_message (_("Collection stopped.\n"));
     }
   else
     {
-      GNUNET_GTK_show_info_message (GNUNET_YES,
-                                    _
-                                    ("Failed to stop collection (consult logs).\n"));
+      GNUNET_GTK_show_info_message (_("Failed to stop collection (consult logs).\n"));
     }
 }
 
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index aa32c8f8..b60578bb 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -28,6 +28,7 @@
 #include "platform.h"
 #include "fs.h"
 #include "search.h"
+#include "status.h"
 #include "meta.h"
 
 /* ****************** FSUI download events ****************** */
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 */
diff --git a/src/plugins/fs/fs.h b/src/plugins/fs/fs.h
index 2c38246d..3c978ff3 100644
--- a/src/plugins/fs/fs.h
+++ b/src/plugins/fs/fs.h
@@ -40,7 +40,7 @@
 enum
 {
   NS_SEARCH_DESCRIPTION = 0,
-  NS_SEARCH_ENCNAME,
+  NS_SEARCH_NAME,
   NS_SEARCH_METADATA,
   NS_SEARCH_RATING,
   NS_SEARCH_NUM,
@@ -348,9 +348,4 @@ extern GtkTreeStore *download_summary;
 
 extern GtkTreeStore *upload_summary;
 
-const char *getColorCode (enum GNUNET_URITRACK_STATE state);
-
-const char *getStatusName (enum GNUNET_URITRACK_STATE state);
-
-
 #endif
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index ad04505d..9aec5622 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -566,8 +566,7 @@ addToNamespaceCB (GtkTreeModel * model,
     }
   else
     {
-      GNUNET_GTK_show_info_message (GNUNET_YES,
-                                    _
+      GNUNET_GTK_show_info_message (_
                                     ("Failed to insert content into namespace "
                                      "(consult logs).\n"));
     }
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index d81b27c5..ed134192 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -48,7 +48,7 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
   GtkWidget *ncbe;
   GtkTreeModel *model;
   GtkTreeIter iter;
-  char *encStr;
+  char *nsName;
   char *description;
   int rating;
   int newrating;
@@ -63,24 +63,27 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
                           "searchNamespaceComboBoxEntry");
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
   description = NULL;
-  encStr = NULL;
+  nsName = NULL;
   if (TRUE == gtk_combo_box_get_active_iter (GTK_COMBO_BOX (ncbe), &iter))
     {
       gtk_tree_model_get (model,
                           &iter,
                           NS_SEARCH_DESCRIPTION, &description,
-                          NS_SEARCH_ENCNAME, &encStr,
+                          NS_SEARCH_NAME, &nsName,
                           NS_SEARCH_RATING, &rating, -1);
-      if ((description != NULL) && (0 == strcmp (description, _("globally"))))
+      if ((description != NULL) && (0 == strcmp (description, "")))
         {
           /* just to be sure */
           gtk_widget_set_sensitive (spin, FALSE);
         }
       else
         {
-          if (encStr != NULL)
+          if (nsName != NULL)
             {
-              GNUNET_enc_to_hash (encStr, &nsid);
+              GNUNET_GE_ASSERT(NULL,
+                               GNUNET_OK ==
+                               GNUNET_pseudonym_name_to_id(ectx, cfg,
+                                                           nsName, &nsid));
               newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
               rating = GNUNET_pseudonym_rank (ectx,
                                               cfg, &nsid, newrating - rating);
@@ -104,8 +107,8 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
     }
   if (description != NULL)
     free (description);
-  if (encStr != NULL)
-    free (encStr);
+  if (nsName != NULL)
+    free (nsName);
   GNUNET_GTK_DEBUG_END ();
 }
 
@@ -125,7 +128,7 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
   GtkTreeModel *model;
   GtkTreeIter iter;
   int rating;
-  char *encStr;
+  char *nsName;
   char *descStr;
   GNUNET_HashCode ns;
   char *root;
@@ -139,22 +142,25 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
                           "searchNamespaceComboBoxEntry");
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
   descStr = NULL;
-  encStr = NULL;
+  nsName = NULL;
   if (TRUE == gtk_combo_box_get_active_iter (GTK_COMBO_BOX (ncbe), &iter))
     {
       gtk_tree_model_get (model,
                           &iter,
                           NS_SEARCH_DESCRIPTION, &descStr,
-                          NS_SEARCH_ENCNAME, &encStr,
+                          NS_SEARCH_NAME, &nsName,
                           NS_SEARCH_RATING, &rating, -1);
-      if ((descStr != NULL) && (0 == strcmp (descStr, _("globally"))))
+      if ((descStr != NULL) && (0 == strcmp (descStr, "")))
         {
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), 0);
           gtk_widget_set_sensitive (spin, FALSE);
         }
-      else if (encStr != NULL)
+      else if (nsName != NULL)
         {
-          GNUNET_enc_to_hash (encStr, &ns);
+          GNUNET_GE_ASSERT(NULL,
+                           GNUNET_OK ==
+                           GNUNET_pseudonym_name_to_id(ectx, cfg,
+                                                       nsName, &ns));
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin), rating);
           gtk_widget_set_sensitive (spin, TRUE);
           keyword
@@ -183,8 +189,8 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
     }
   if (descStr != NULL)
     free (descStr);
-  if (encStr != NULL)
-    free (encStr);
+  if (nsName != NULL)
+    free (nsName);
   GNUNET_GTK_DEBUG_END ();
 }
 
@@ -200,24 +206,19 @@ static void *
 saveDiscovery (void *cls)
 {
   struct NewNamespaceInfo *nni = cls;
-
   GtkListStore *model;
   GtkTreeIter iter;
-  GNUNET_EncName enc;
-  char *name;
   struct GNUNET_MetaData *dmd;
   GtkWidget *ncbe;
   char *desc;
-  size_t n;
+  char *haveName;
   int found;
-  char *encName;
 
   GNUNET_GTK_DEBUG_BEGIN ();
   ncbe =
     glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                           "searchNamespaceComboBoxEntry");
   model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe)));
-  GNUNET_hash_to_enc (nni->namespaceId, &enc);
   if (nni->md == NULL)
     {
       dmd = NULL;
@@ -242,9 +243,6 @@ saveDiscovery (void *cls)
         desc = GNUNET_strdup ("");
     }
 
-  n = strlen (desc) + 64;
-  name = GNUNET_malloc (n);
-  GNUNET_snprintf (name, n, "%s: %.*s", desc, 20, &enc);
   /* check if present! */
   found = GNUNET_NO;
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
@@ -252,30 +250,27 @@ saveDiscovery (void *cls)
       do
         {
           gtk_tree_model_get (GTK_TREE_MODEL (model),
-                              &iter, NS_SEARCH_ENCNAME, &encName, -1);
-          if ((encName != NULL) &&
-              (0 == strcmp (encName, (const char *) &enc)))
+                              &iter, NS_SEARCH_NAME, &haveName, -1);
+          if ((haveName != NULL) &&
+              (0 == strcmp (haveName, nni->namespaceName)))
             found = GNUNET_YES;
-          GNUNET_free_non_null (encName);
+          GNUNET_free_non_null (haveName);
         }
       while ((found == GNUNET_NO) &&
              (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter)));
     }
   if (found == GNUNET_NO)
     {
-      GNUNET_GTK_show_info_message (GNUNET_YES,
-                                    _("Namespace found: %s - %.*s\n"), desc,
-                                    20, &enc);
+      GNUNET_GTK_show_info_message (_("Namespace `%s' found: %s.\n"), nni->namespaceName, desc);
       gtk_list_store_append (model, &iter);
       gtk_list_store_set (model,
                           &iter,
-                          NS_SEARCH_DESCRIPTION, name,
-                          NS_SEARCH_ENCNAME, &enc,
+                          NS_SEARCH_DESCRIPTION, desc,
+                          NS_SEARCH_NAME, nni->namespaceName,
                           NS_SEARCH_METADATA, dmd,
                           NS_SEARCH_RATING, nni->rating, -1);
     }
   GNUNET_free (desc);
-  GNUNET_free (name);
   GNUNET_GTK_DEBUG_END ();
 
   return NULL;
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 26e3844a..92329cb9 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -27,6 +27,7 @@
 #include "platform.h"
 #include "gnunetgtk_common.h"
 #include "search.h"
+#include "status.h"
 #include "helper.h"
 #include "fs.h"
 #include "meta.h"
@@ -1164,27 +1165,35 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                                      &iter))
     {
       char *descStr;
-      char *ns;
+      char *nsName;
 
-      ns = NULL;
+      nsName = NULL;
       descStr = NULL;
       gtk_tree_model_get (gtk_combo_box_get_model
                           (GTK_COMBO_BOX (searchNamespaceGtkCB)), &iter,
-                          NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_ENCNAME,
-                          &ns, -1);
+                          NS_SEARCH_DESCRIPTION, &descStr, NS_SEARCH_NAME,
+                          &nsName, -1);
 
-      if ((descStr != NULL) && (0 == strcmp (descStr, _("globally"))))
+      if ((descStr != NULL) && (0 == strcmp (descStr, "")))
         {
-          ns = NULL;
+          nsName = NULL;
         }
       else
         {
-          if ((descStr == NULL) && (ns != NULL))
-            descStr = GNUNET_strdup (ns);
+          if ((descStr == NULL) && (nsName != NULL))
+            descStr = GNUNET_strdup (nsName);
         }
-      if (ns != NULL)
+      if (nsName != NULL)
         {
           char *ustring;
+          GNUNET_EncName enc;
+          GNUNET_HashCode nsid;
+
+          GNUNET_GE_ASSERT(NULL,
+                           GNUNET_OK ==
+                           GNUNET_pseudonym_name_to_id(ectx, cfg,
+                                                       nsName, &nsid));
+          GNUNET_hash_to_enc(&nsid, &enc);
 
           ustring =
             GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) +
@@ -1192,7 +1201,7 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
                            strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10);
           strcpy (ustring, GNUNET_ECRS_URI_PREFIX);
           strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX);
-          strcat (ustring, ns);
+          strcat (ustring, (const char*)&enc);
           strcat (ustring, "/");
           strcat (ustring, searchString);
           fsss.uri = GNUNET_ECRS_string_to_uri (ectx, ustring);
@@ -1208,8 +1217,8 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
         }
       if (descStr != NULL)
         free (descStr);
-      if (ns != NULL)
-        free (ns);
+      if (nsName != NULL)
+        free (nsName);
     }
   if (fsss.uri == NULL)
     fsss.uri = GNUNET_ECRS_keyword_string_to_uri (ectx, searchString);
diff --git a/src/plugins/fs/status.c b/src/plugins/fs/status.c
new file mode 100644
index 00000000..1ce858d3
--- /dev/null
+++ b/src/plugins/fs/status.c
@@ -0,0 +1,79 @@
+/*
+     This file is part of GNUnet.
+     (C) 2007, 2008 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
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/plugins/fs/status.c
+ * @brief status codes for files
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include <GNUnet/gnunet_uritrack_lib.h>
+#include "status.h"
+
+
+
+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;
+}
+
+
+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 "";
+}
+
+
+/* end of status.c */
diff --git a/src/plugins/fs/status.h b/src/plugins/fs/status.h
new file mode 100644
index 00000000..b2db5f4f
--- /dev/null
+++ b/src/plugins/fs/status.h
@@ -0,0 +1,38 @@
+/*
+     This file is part of GNUnet.
+     (C) 2007, 2008 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
+     by the Free Software Foundation; either version 2, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/plugins/fs/status.h
+ * @brief status codes for files
+ * @author Christian Grothoff
+ */
+
+#ifndef FS_STATUS_H
+#define FS_STATUS_H
+
+#include "platform.h"
+#include <GNUnet/gnunet_uritrack_lib.h>
+#include "status.h"
+
+const char *getColorCode (enum GNUNET_URITRACK_STATE state);
+
+const char *getStatusName (enum GNUNET_URITRACK_STATE state);
+
+#endif
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 79145fb6..4c179dd0 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -478,12 +478,18 @@ statsProcessor (const char *optName, unsigned long long value, void *data)
   return GNUNET_OK;
 }
 
+struct UpdateClosure {
+  GNUNET_CronTime delta;
+  int is_running;
+};
+
 /*
  * Update the status bar indicator about daemon and connexions status
  */
 static void *
-updateDaemonStatus (void *delta)
+updateDaemonStatus (void *cls)
 {
+  struct UpdateClosure * uc = cls;
   static gboolean once = TRUE;
   static int last_status = -5;
   unsigned long long connected_peers;
@@ -567,10 +573,10 @@ updateDaemonStatus (void *delta)
 
       once = FALSE;
     }
-  if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
+  if (uc->is_running)
     {
       if (GNUNET_OK !=
-          getStatValue (&connected_peers, (GNUNET_CronTime *) delta, NULL,
+          getStatValue (&connected_peers, NULL, NULL,
                         "# of connected peers", GNUNET_NO))
         {
           if (last_status != -1)
@@ -665,15 +671,16 @@ updateStatValues (void *unused)
 {
   static GNUNET_CronTime lastUpdate;
   GNUNET_CronTime now;
-  GNUNET_CronTime delta;
+  struct UpdateClosure uc;
 
   now = GNUNET_get_time ();
-  delta = now - lastUpdate;
+  uc.delta = now - lastUpdate;
+  uc.is_running = GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg);
   GNUNET_mutex_lock (lock);
   if (GNUNET_OK ==
-      GNUNET_STATS_get_statistics (ectx, sock, &statsProcessor, &delta))
+      GNUNET_STATS_get_statistics (ectx, sock, &statsProcessor, &uc.delta))
     lastUpdate = now;
-  GNUNET_GTK_save_call (&updateDaemonStatus, (void *) &delta);
+  GNUNET_GTK_save_call (&updateDaemonStatus, (void *) &uc);
   GNUNET_mutex_unlock (lock);
 }