6 files changed, 519 insertions, 503 deletions

diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am
index 17bd42ac..7e3b4dfe 100644
--- a/src/plugins/fs/Makefile.am
+++ b/src/plugins/fs/Makefile.am
@@ -11,11 +11,13 @@ plugin_LTLIBRARIES = \
 
 libgnunetgtkmodule_fs_la_SOURCES = \
   collection.c collection.h \
+  content_tracking.c content_tracking.h \
   directory.c \
   fs.c fs.h \
   helper.c helper.h \
   meta.c meta.h \
   namespace.c namespace.h \
+  namespace_search.c \
   search.c search.h \
   download.c download.h \
   upload.c upload.h
diff --git a/src/plugins/fs/content_tracking.c b/src/plugins/fs/content_tracking.c
new file mode 100644
index 00000000..1767432d
--- /dev/null
+++ b/src/plugins/fs/content_tracking.c
@@ -0,0 +1,178 @@
+
+/*
+     This file is part of GNUnet.
+     (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
+     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/content_tracking.c
+ * @brief code for tracking available content
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunetgtk_common.h"
+#include "fs.h"
+#include "helper.h"
+#include "meta.h"
+#include "namespace.h"
+#include "content_tracking.h"
+#include <GNUnet/gnunet_util_crypto.h>
+#include <GNUnet/gnunet_uritrack_lib.h>
+#include <GNUnet/gnunet_namespace_lib.h>
+#include <extractor.h>
+
+static void * clearContentList(void * mdl) {
+  GtkTreeModel * model = GTK_TREE_MODEL(mdl);
+  struct ECRS_URI * uri;
+  struct ECRS_MetaData * meta;
+  GtkTreeIter iter;
+
+  DEBUG_BEGIN();
+  if (gtk_tree_model_get_iter_first(model,
+                                    &iter)) {
+    do {        
+      gtk_tree_model_get(model,
+                         &iter,
+                         NAMESPACE_URI, &uri,
+                         NAMESPACE_META, &meta,
+                         -1);
+      ECRS_freeUri(uri);
+      ECRS_freeMetaData(meta);
+      gtk_list_store_set(GTK_LIST_STORE(model),
+                         &iter,
+                         NAMESPACE_URI, NULL,
+                         NAMESPACE_META, NULL,
+                         -1);
+    } while (gtk_list_store_remove(GTK_LIST_STORE(model),
+                                   &iter));
+  }
+  DEBUG_END();
+  return NULL;
+}
+
+
+void on_clearAvailableContentButton_clicked_fs(GtkWidget * dummy1,
+                                               GtkWidget * dummy2) {
+  GtkWidget * contentList;
+  GtkTreeModel * model;
+
+  DEBUG_BEGIN();
+  contentList
+    = glade_xml_get_widget(getMainXML(),
+                           "availableContentList");
+  model
+    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
+  URITRACK_clearTrackedURIS(ectx,
+                            cfg);
+  gtkSaveCall(&clearContentList, model);
+  DEBUG_END();
+}
+
+void on_trackingCheckButton_toggled_fs(GtkWidget * dummy1,
+                                       GtkWidget * dummy2) {
+  GtkWidget * trackCheckButton;
+
+  trackCheckButton
+    = glade_xml_get_widget(getMainXML(),
+                           "trackingCheckButton");
+  URITRACK_trackURIS(ectx,
+                     cfg,
+                     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trackCheckButton)) == TRUE ?
+                     YES : NO);
+}
+
+
+
+/**
+ * Add the given content to the globally available
+ * content model.  Check that it is not already
+ * present!
+ */
+static void * updateView(void * cls) {
+  const ECRS_FileInfo * fi = cls;
+  GtkTreeIter iter;
+  char * filename;
+  char * uriString;
+  unsigned long long size;
+  char * size_h;
+  GtkWidget * contentList;
+  GtkTreeModel * model;
+
+  contentList
+    = glade_xml_get_widget(getMainXML(),
+                           "availableContentList");
+  model
+    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
+  filename = ECRS_getFirstFromMetaData(fi->meta,
+                                       EXTRACTOR_FILENAME,
+                                       EXTRACTOR_TITLE,
+                                       EXTRACTOR_DESCRIPTION,
+                                       EXTRACTOR_SUBJECT,
+                                       EXTRACTOR_ARTIST,
+                                       EXTRACTOR_AUTHOR,
+                                       EXTRACTOR_PUBLISHER,
+                                       EXTRACTOR_CREATOR,
+                                       EXTRACTOR_PRODUCER,
+                                       EXTRACTOR_UNKNOWN,
+                                       -1);
+  if (filename == NULL) {
+    filename = STRDUP(_("no name given"));
+  } else {
+    char * dotdot;
+
+    while (NULL != (dotdot = strstr(filename, "..")))
+      dotdot[0] = dotdot[1] = '_';
+    filename = validate_utf8(filename);
+  }
+
+  if (ECRS_isFileUri(fi->uri))
+    size = ECRS_fileSize(fi->uri);
+  else
+    size = 0;
+  uriString = ECRS_uriToString(fi->uri);
+  gtk_list_store_append(GTK_LIST_STORE(model),
+                        &iter);
+  size_h = string_get_fancy_byte_size(size);
+  gtk_list_store_set(GTK_LIST_STORE(model),
+                     &iter,
+                     NAMESPACE_FILENAME, filename,
+                     NAMESPACE_SIZE, size,
+                     NAMESPACE_HSIZE, size_h,
+                     NAMESPACE_URISTRING, uriString,
+                     NAMESPACE_URI, ECRS_dupUri(fi->uri),
+                     NAMESPACE_META, ECRS_dupMetaData(fi->meta),
+                     -1);
+  FREE(size_h);
+  FREE(filename);
+  FREE(uriString);
+  return NULL;
+}
+
+/**
+ * Add the given content to the globally available
+ * content model.  Check that it is not already
+ * present!
+ */
+int updateViewSave(const ECRS_FileInfo * fi,
+                   const HashCode512 * key,
+                   int isRoot,
+                   void * closure) {
+  gtkSaveCall(&updateView, (void*) fi);
+  return OK;
+}
diff --git a/src/plugins/fs/content_tracking.h b/src/plugins/fs/content_tracking.h
new file mode 100644
index 00000000..075810aa
--- /dev/null
+++ b/src/plugins/fs/content_tracking.h
@@ -0,0 +1,42 @@
+/*
+     This file is part of GNUnet.
+     (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
+     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/content_tracking.h
+ * @brief code for tracking available content
+ * @author Christian Grothoff
+ */
+
+#ifndef CONTENT_TRACKING_H
+#define CONTENT_TRACKING_H
+
+#include <GNUnet/gnunet_ecrs_lib.h>
+
+/**
+ * Add the given content to the globally available
+ * content model.  Check that it is not already
+ * present!
+ */
+int updateViewSave(const ECRS_FileInfo * fi,
+                   const HashCode512 * key,
+                   int isRoot,
+                   void * closure);
+
+#endif
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index 810fb52e..5f030368 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -89,15 +89,7 @@ void on_open_menu_activate_fs(GtkWidget * dummy1,
   SearchList * list;
   struct ECRS_URI * uri;
   const char * kws[2];
-#if 1
-  /* somehow on my system I get this (and only this event)
-     always twice -- not sure why, but this is a workaround
-     for now */
-  static int modulo;
 
-  if (0 == (1 & modulo++))
-    return; 
-#endif
   dn = selectFile();
   if (dn == NULL)
     return;
@@ -114,10 +106,7 @@ void on_open_menu_activate_fs(GtkWidget * dummy1,
   }
   fd = disk_file_open(NULL,
                       dn,
-#ifdef O_LARGEFILE
-                      O_LARGEFILE | 
-#endif          
-          O_RDONLY);
+                      O_LARGEFILE |  O_RDONLY);
   if (fd == -1) {
     addLogEntry(_("Error opening file `%s'."),
                 dn);
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index c81cbaa6..4baff68d 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2005, 2006, 2007 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
@@ -20,7 +20,7 @@
 
 /**
  * @file src/plugins/fs/namespace.c
- * @brief code for operations with namespaces
+ * @brief operations creating/deleting and adding to/updating namespaces
  * @author Christian Grothoff
  */
 
@@ -30,31 +30,34 @@
 #include "helper.h"
 #include "meta.h"
 #include "namespace.h"
+#include "content_tracking.h"
 #include <GNUnet/gnunet_util_crypto.h>
 #include <GNUnet/gnunet_uritrack_lib.h>
 #include <GNUnet/gnunet_namespace_lib.h>
 #include <extractor.h>
 
 /**
- * @brief linked list of pages in the search notebook
+ * @brief linked list of pages in the namespace notebook
  */
 typedef struct NL {
   struct NL * next;
   GtkWidget * treeview;
   GtkWidget * namespacepage;
+  GtkWidget * addButton;
   GtkTreeModel * model;
-  GtkWidget * anonymityButton;
   char * name;
   HashCode512 id;
   struct ECRS_MetaData * meta;
 } NamespaceList;
 
+static GtkTreeSelection * content_selection;
+
 static NamespaceList * head;
 
 static GladeXML * metaXML;
 
 static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
-                                      GtkWidget ** anonSpin) {
+                                      GtkWidget ** addButton) {
   GtkWidget * child;
   GtkWidget * resultList;
   GtkCellRenderer * renderer;
@@ -73,8 +76,8 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
                                       "namespaceContentFrame");
   resultList = glade_xml_get_widget(namespaceXML,
                                     "namespaceContentFrameTreeView");
-  *anonSpin = glade_xml_get_widget(namespaceXML,
-                                   "namespaceAnonymitySpinButton");
+  *addButton = glade_xml_get_widget(namespaceXML,
+                                    "addButton");
   if (treeview != NULL)
     (*treeview) = GTK_WIDGET(GTK_TREE_VIEW(resultList));
   model =
@@ -94,6 +97,9 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
                           GTK_TREE_MODEL(model));
   gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(resultList)),
                               GTK_SELECTION_MULTIPLE);
+
+
+
   renderer = gtk_cell_renderer_text_new();
   col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(resultList),
                                               -1,
@@ -234,113 +240,7 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
   return child;
 }
 
-/**
- * Add the given content to the globally available
- * content model.  Check that it is not already
- * present!
- */
-static void * updateView(void * cls) {
-  const ECRS_FileInfo * fi = cls;
-  GtkTreeIter iter;
-  char * filename;
-  char * uriString;
-  unsigned long long size;
-  char * size_h;
-  GtkWidget * contentList;
-  GtkTreeModel * model;
-
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  model
-    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  filename = ECRS_getFirstFromMetaData(fi->meta,
-                                       EXTRACTOR_FILENAME,
-                                       EXTRACTOR_TITLE,
-                                       EXTRACTOR_DESCRIPTION,
-                                       EXTRACTOR_SUBJECT,
-                                       EXTRACTOR_ARTIST,
-                                       EXTRACTOR_AUTHOR,
-                                       EXTRACTOR_PUBLISHER,
-                                       EXTRACTOR_CREATOR,
-                                       EXTRACTOR_PRODUCER,
-                                       EXTRACTOR_UNKNOWN,
-                                       -1);
-  if (filename == NULL) {
-    filename = STRDUP(_("no name given"));
-  } else {
-    char * dotdot;
 
-    while (NULL != (dotdot = strstr(filename, "..")))
-      dotdot[0] = dotdot[1] = '_';
-    filename = validate_utf8(filename);
-  }
-
-  if (ECRS_isFileUri(fi->uri))
-    size = ECRS_fileSize(fi->uri);
-  else
-    size = 0;
-  uriString = ECRS_uriToString(fi->uri);
-  gtk_list_store_append(GTK_LIST_STORE(model),
-                        &iter);
-  size_h = string_get_fancy_byte_size(size);
-  gtk_list_store_set(GTK_LIST_STORE(model),
-                     &iter,
-                     NAMESPACE_FILENAME, filename,
-                     NAMESPACE_SIZE, size,
-                     NAMESPACE_HSIZE, size_h,
-                     NAMESPACE_URISTRING, uriString,
-                     NAMESPACE_URI, ECRS_dupUri(fi->uri),
-                     NAMESPACE_META, ECRS_dupMetaData(fi->meta),
-                     -1);
-  FREE(size_h);
-  FREE(filename);
-  FREE(uriString);
-  return NULL;
-}
-
-/**
- * Add the given content to the globally available
- * content model.  Check that it is not already
- * present!
- */
-static int updateViewSave(const ECRS_FileInfo * fi,
-                          const HashCode512 * key,
-                          int isRoot,
-                          void * closure) {
-  gtkSaveCall(&updateView, (void*) fi);
-  return OK;
-}
-
-
-static void * clearContentList(void * mdl) {
-  GtkTreeModel * model = GTK_TREE_MODEL(mdl);
-  struct ECRS_URI * uri;
-  struct ECRS_MetaData * meta;
-  GtkTreeIter iter;
-
-  DEBUG_BEGIN();
-  if (gtk_tree_model_get_iter_first(model,
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(model,
-                         &iter,
-                         NAMESPACE_URI, &uri,
-                         NAMESPACE_META, &meta,
-                         -1);
-      ECRS_freeUri(uri);
-      ECRS_freeMetaData(meta);
-      gtk_list_store_set(GTK_LIST_STORE(model),
-                         &iter,
-                         NAMESPACE_URI, NULL,
-                         NAMESPACE_META, NULL,
-                         -1);
-    } while (gtk_list_store_remove(GTK_LIST_STORE(model),
-                                   &iter));
-  }
-  DEBUG_END();
-  return NULL;
-}
 
 /**
  * Update the model that lists the content of a namespace:
@@ -454,6 +354,22 @@ static int addNamespaceContentToModel(void * cls,
 }
 
 /**
+ * The user has edited the search entry.
+ * Update search button status.
+ */
+static void on_namespaceContentSelectionChanged(gpointer signal,
+                                                gpointer cls) {
+  NamespaceList * list = head;
+
+  while (list != NULL) {
+    gtk_widget_set_sensitive(list->addButton,
+                             gtk_tree_selection_count_selected_rows(content_selection) > 0);
+    list = list->next;
+  }
+}
+
+
+/**
  * Add a tab for the given namespace.
  */
 static int addTabForNamespace(void * unused,
@@ -463,7 +379,7 @@ static int addTabForNamespace(void * unused,
                               int rating) {
   NamespaceList * list;
   GtkWidget * label;
-  GtkWidget * spin;
+  GtkWidget * addButton;
   GtkWidget * notebook;
   GtkListStore * model;
 
@@ -475,9 +391,9 @@ static int addTabForNamespace(void * unused,
   list->meta = ECRS_dupMetaData(md);
   list->namespacepage
     = makeNamespaceFrame(&list->treeview,
-                         &spin);
-  list->anonymityButton
-    = spin;
+                         &addButton);
+  list->addButton
+    = addButton;
   model = GTK_LIST_STORE
     (gtk_tree_view_get_model
      (GTK_TREE_VIEW(list->treeview)));
@@ -486,6 +402,8 @@ static int addTabForNamespace(void * unused,
   list->next
     = head;
   head = list;
+  /* update sensitivity of add button */
+  on_namespaceContentSelectionChanged(NULL, NULL);
   notebook
     = glade_xml_get_widget(getMainXML(),
                            "localNamespacesNotebook");
@@ -673,19 +591,11 @@ void namespaceDelete_clicked_fs(GtkWidget * dummy1,
   gtk_widget_destroy(dialog);
   if (GTK_RESPONSE_YES != ret)
     return;
-
   gtk_notebook_remove_page(GTK_NOTEBOOK(notebook),
                            num);
-  if (prev == NULL)
-    head = list->next;
-  else
-    prev->next = list->next;
   NS_deleteNamespace(ectx,
                      cfg,
                      list->name);
-  FREE(list->name);
-  ECRS_freeMetaData(list->meta);
-  FREE(list);
   DEBUG_END();
 }
 
@@ -696,7 +606,6 @@ typedef struct {
   HashCode512 * lastId;
   HashCode512 thisId;
   HashCode512 * nextId;
-  struct ECRS_MetaData * meta;
 } IUC;
 
 /**
@@ -710,24 +619,17 @@ static void initiateUpload(GtkTreeModel * model,
   IUC * cls = data;
   struct ECRS_URI * resultURI;
   struct ECRS_URI * dst;
-  struct ECRS_MetaData * ometa;
   struct ECRS_MetaData * meta;
   NamespaceList * list;
   ECRS_FileInfo fi;
 
   DEBUG_BEGIN();
   dst = NULL;
-  meta = cls->meta;
   gtk_tree_model_get(model,
                      iter,
                      NAMESPACE_URI, &dst,
-                     NAMESPACE_META, &ometa,
+                     NAMESPACE_META, &meta,
                      -1);
-  /* FIXME: we may want to optionally combine the metadata from the
-     original file ID (ometa) with the new metadata (cls->meta) here;
-     or if we limit us to one file at a time, show the original
-     metadata immediately with the dialog. */
-
   if (dst == NULL) {
     GE_BREAK(ectx, 0);
     return;
@@ -780,51 +682,23 @@ void on_namespaceInsertMetaDataDialogMetaDataAddButton_clicked_fs(GtkWidget * du
                            "metaDataTreeView");
 }
 
+/**
+ * User clicked the "add" button, add content from
+ * available content list to the currently selected
+ * namespace.
+ */
 void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
                                          GtkWidget * dummy2) {
+
   const char * identifierName;
   NamespaceList * list;
   GtkWidget * nameLine;
   GtkWidget * page;
   GtkWidget * notebook;
   GtkWidget * dialog;
-  struct ECRS_MetaData * meta;
   HashCode512 nextId;
-  GtkWidget * contentList;
-  GtkTreeSelection * selection;
   IUC cls;
   gint num;
-  GtkTreeIter iter;
-
-  DEBUG_BEGIN();
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  selection
-    = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList));
-  if (0 == gtk_tree_selection_count_selected_rows(selection)) {
-   /* IMPROVE-ME: disable the menu item
-      as long as this may happen! */
-    dialog = gtk_message_dialog_new
-      (NULL,
-       GTK_DIALOG_MODAL,
-       GTK_MESSAGE_ERROR,
-       GTK_BUTTONS_CLOSE,
-       _("You must select some available content for publication first!"));
-    gtk_dialog_run(GTK_DIALOG(dialog));
-    gtk_widget_destroy(dialog);
-    return;
-  }
-  if (FALSE == gtk_tree_selection_get_selected(selection,
-                                               NULL,
-                                               &iter)) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-  gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)),
-                     &iter,
-                     NAMESPACE_META, &meta,
-                     -1);
 
   notebook
     = glade_xml_get_widget(getMainXML(),
@@ -848,12 +722,6 @@ void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
                     "namespaceInsertDialog",
                     PACKAGE_NAME);
   connectGladeWithPlugins(metaXML);
-  createMetaDataListTreeView(metaXML,
-                             "metaDataTreeView",
-                             "namespaceInsertPreview",
-                             meta);
-  createMetaTypeComboBox(metaXML,
-                         "namespaceInsertMetaTypeComboBox");
   dialog = glade_xml_get_widget(metaXML,
                                 "namespaceInsertDialog");
   gtk_dialog_set_default_response(GTK_DIALOG(dialog),
@@ -875,10 +743,6 @@ void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
       gtk_widget_destroy(dialog);
       return;
     }
-
-    meta = getMetaDataFromList(metaXML,
-                               "metaDataTreeView",
-                               "namespaceInsertPreview");
     cls.anonymityLevel
       = getSpinButtonValue(metaXML,
                            "anonymitySpinButton");
@@ -904,27 +768,25 @@ void on_namespaceInsertButton_clicked_fs(GtkWidget * dummy1,
            &nextId);
       cls.nextId = &nextId;
     }
-    cls.meta = meta;
     ggc_tree_selection_selected_foreach
-      (selection,
+      (content_selection,
        &initiateUpload,
        &cls);
-
-    ECRS_freeMetaData(meta);
   }
   gtk_widget_destroy(dialog);
   UNREF(metaXML);
   metaXML = NULL;
-  DEBUG_END();
 }
 
+
+/**
+ * FIXME!!!
+ */ 
 void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
                                          GtkWidget * dummy2) {
   const char * identifierName;
   NamespaceList * list;
   GtkWidget * nameLine;
-  GtkWidget * page;
-  GtkWidget * notebook;
   GtkWidget * dialog;
   GtkWidget * spin;
   GtkWidget * update;
@@ -932,84 +794,14 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
   struct ECRS_MetaData * meta;
   HashCode512 nextId;
   HashCode512 prevId;
-  GtkWidget * contentList;
   GtkTreeSelection * selection;
-  GtkTreeSelection * selectionNamespace;
   IUC cls;
-  gint num;
   char * last;
   char * next;
   char * freq;
 
   DEBUG_BEGIN();
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  selection
-    = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList));
-  if (0 == gtk_tree_selection_count_selected_rows(selection)) {
-    /* IMPROVE-ME: disable the menu item
-       as long as this may happen! */
-    dialog = gtk_message_dialog_new
-      (NULL,
-       GTK_DIALOG_MODAL,
-       GTK_MESSAGE_ERROR,
-       GTK_BUTTONS_CLOSE,
-       _("You must select some available content for publication first!"));
-    gtk_dialog_run(GTK_DIALOG(dialog));
-    gtk_widget_destroy(dialog);
-    return;
-  }
-  if (FALSE == gtk_tree_selection_get_selected(selection,
-                                               NULL,
-                                               &iter)) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-  gtk_tree_model_get(gtk_tree_view_get_model(GTK_TREE_VIEW(contentList)),
-                     &iter,
-                     NAMESPACE_META, &meta,
-                     -1);
-
-  notebook
-    = glade_xml_get_widget(getMainXML(),
-                           "localNamespacesNotebook");
-  num = gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook));
-  GE_ASSERT(ectx, num != -1);
-  page =gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook),
-                                  num);
-  list = head;
-  while ( (list != NULL) &&
-          (list->namespacepage != page) )
-    list = list->next;
-  if (list == NULL) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
-  cls.namespaceName = list->name;
 
-  /* check that in namespace (updateable) content is selected! */
-  selectionNamespace
-    = gtk_tree_view_get_selection(GTK_TREE_VIEW(list->treeview));
-  if (0 == gtk_tree_selection_count_selected_rows(selectionNamespace)) {
-   /* IMPROVE-ME: disable the menu item
-      as long as this may happen! */
-    dialog = gtk_message_dialog_new
-      (NULL,
-       GTK_DIALOG_MODAL,
-       GTK_MESSAGE_ERROR,
-       GTK_BUTTONS_CLOSE,
-       _("You must select some existing namespace content to be updated first!"));
-    gtk_dialog_run(GTK_DIALOG(dialog));
-    gtk_widget_destroy(dialog);
-    return;
-  }
-  if (FALSE == gtk_tree_selection_get_selected(selectionNamespace,
-                                               NULL,
-                                               &iter)) {
-    GE_BREAK(ectx, 0);
-    return;
-  }
   gtk_tree_model_get(list->model,
                      &iter,
                      IN_NAMESPACE_LAST_STRING, &last,
@@ -1022,6 +814,8 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
                     PACKAGE_NAME);
   connectGladeWithPlugins(metaXML);
 
+
+
   nameLine = glade_xml_get_widget(metaXML,
                                   "identifierLabel");
   gtk_label_set_text(GTK_LABEL(nameLine),
@@ -1137,9 +931,6 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
          strlen(identifierName),
          &nextId);
     cls.nextId = &nextId;
-    cls.meta = getMetaDataFromList(metaXML,
-                                   "namespaceUpdateMetaDataTreeView",
-                                   "namespaceUpdatePreviewImage");
     spin = glade_xml_get_widget(metaXML,
                                 "namespaceUpdateAnonymitySpinButton");
     cls.anonymityLevel
@@ -1149,7 +940,6 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
       (selection,
        &initiateUpload,
        &cls);
-    ECRS_freeMetaData(cls.meta);
   }
   gtk_widget_destroy(dialog);
   UNREF(metaXML);
@@ -1163,187 +953,6 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
   DEBUG_END();
 }
 
-void on_clearAvailableContentButton_clicked_fs(GtkWidget * dummy1,
-                                               GtkWidget * dummy2) {
-  GtkWidget * contentList;
-  GtkTreeModel * model;
-
-  DEBUG_BEGIN();
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  model
-    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  URITRACK_clearTrackedURIS(ectx,
-                            cfg);
-  gtkSaveCall(&clearContentList, model);
-  DEBUG_END();
-}
-
-void on_trackingCheckButton_toggled_fs(GtkWidget * dummy1,
-                                       GtkWidget * dummy2) {
-  GtkWidget * trackCheckButton;
-
-  trackCheckButton
-    = glade_xml_get_widget(getMainXML(),
-                           "trackingCheckButton");
-  URITRACK_trackURIS(ectx,
-                     cfg,
-                     gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(trackCheckButton)) == TRUE ?
-                     YES : NO);
-}
-
-/**
- * The spin button giving the rating for a particular namespace
- * has been changed.  Store the new rating for the namespace.
- */
-void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy,
-                                             GtkWidget * dummy2) {
-  GtkWidget * spin;
-  GtkWidget * ncbe;
-  GtkTreeModel * model;
-  GtkTreeIter iter;
-  char * encStr;
-  char * description;
-  int rating;
-  int newrating;
-
-  DEBUG_BEGIN();
-  spin
-    = glade_xml_get_widget(getMainXML(),
-                           "namespaceRatingSpinButton");
-  ncbe
-    = glade_xml_get_widget(getMainXML(),
-                           "searchNamespaceComboBoxEntry");
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(ncbe));
-  description = NULL;
-  encStr = 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_RATING, &rating,
-                       -1);
-    if ( (description != NULL) &&
-         (0 == strcmp(description,
-                      _("globally"))) ) {
-      /* just to be sure */
-      gtk_widget_set_sensitive(spin,
-                               FALSE);
-    } else {
-      if (encStr != NULL) {
-        newrating = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
-        rating = NS_rankNamespace(ectx,
-                                  cfg,
-                                  encStr,
-                                  newrating - rating);
-        if (rating != newrating) {
-          /* concurrent modification? */
-          gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                                    rating);
-          GE_BREAK(ectx, 0);    
-        }
-        gtk_list_store_set(GTK_LIST_STORE(model),
-                           &iter,
-                           NS_SEARCH_RATING, rating,
-                           -1);
-      }
-    }
-  } else {
-    /* FIXME: if enc2hash succeeds, we may want to keep this
-       active */
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                              0);
-    gtk_widget_set_sensitive(spin,
-                             FALSE);
-  }
-  if (description != NULL)
-    free(description);
-  if (encStr != NULL)
-    free(encStr);
-  DEBUG_END();
-}
-
-
-/**
- * The namespace in the search window has changed.
- * Update the trust level (possibly changing sensitivity)
- * and set the search string to the root (if available).
- */
-void on_searchNamespaceComboBoxEntry_changed_fs(GtkWidget * dummy,
-                                                GtkWidget * dummy2) {
-  GtkWidget * keyword;
-  GtkWidget * spin;
-  GtkWidget * ncbe;
-  GtkTreeModel * model;
-  GtkTreeIter iter;
-  int rating;
-  char * encStr;
-  char * descStr;
-  HashCode512 ns;
-  HashCode512 root;
-  EncName enc;
-
-  DEBUG_BEGIN();
-  spin
-    = glade_xml_get_widget(getMainXML(),
-                           "namespaceRatingSpinButton");
-  ncbe
-    = glade_xml_get_widget(getMainXML(),
-                           "searchNamespaceComboBoxEntry");
-  model = gtk_combo_box_get_model(GTK_COMBO_BOX(ncbe));
-  descStr = NULL;
-  encStr = 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_RATING, &rating,
-                       -1);
-    if ( (descStr != NULL) &&
-         (0 == strcmp(descStr,
-                      _("globally"))) ) {
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                                0);
-      gtk_widget_set_sensitive(spin,
-                               FALSE);
-    } else if (encStr != NULL) {
-      enc2hash(encStr,
-               &ns);
-      gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                                rating);
-      gtk_widget_set_sensitive(spin,
-                               TRUE);
-      if (OK == NS_getNamespaceRoot(ectx,
-                                    cfg,
-                                    encStr,
-                                    &root)) {
-        hash2enc(&root,
-                 &enc);
-        keyword
-          = glade_xml_get_widget(getMainXML(),
-                                 "fssearchKeywordComboBoxEntry");
-        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(keyword))),
-                           (const gchar*) &enc);
-      }
-    }
-  } else {
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
-                              0);
-    gtk_widget_set_sensitive(spin,
-                             FALSE);
-  }
-  if (descStr != NULL)
-    free(descStr);
-  if (encStr != NULL)
-    free(encStr);
-  DEBUG_END();
-}
-
 
 
 void fs_namespace_start() {
@@ -1375,8 +984,18 @@ void fs_namespace_start() {
                              G_TYPE_POINTER); /* uri */
   gtk_tree_view_set_model(GTK_TREE_VIEW(contentList),
                           GTK_TREE_MODEL(model));
-  gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList)),
+  content_selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(contentList));
+  gtk_tree_selection_set_mode(content_selection,
                               GTK_SELECTION_MULTIPLE);
+
+  g_signal_connect_data(content_selection,
+                        "changed",
+                        G_CALLBACK(&on_namespaceContentSelectionChanged),
+                        NULL,
+                        NULL,
+                        0);
+
+
   renderer = gtk_cell_renderer_text_new();
   col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(contentList),
                                               -1,
@@ -1398,11 +1017,11 @@ void fs_namespace_start() {
   renderer = gtk_cell_renderer_text_new();
   g_object_set (renderer, "xalign", 1.00, NULL);
   col = gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(contentList),
-                                              -1,
-                                              _("Filesize"),
-                                              renderer,
-                                              "text", NAMESPACE_HSIZE,
-                                              NULL);
+                                                    -1,
+                                                    _("Filesize"),
+                                                    renderer,
+                                                    "text", NAMESPACE_HSIZE,
+                                                    NULL);
   column = gtk_tree_view_get_column(GTK_TREE_VIEW(contentList),
                                     col - 1);
   gtk_tree_view_column_set_resizable(column, TRUE);
@@ -1439,57 +1058,56 @@ void fs_namespace_start() {
   DEBUG_END();
 }
 
-#if 0
-void on_availableContentList_destroy_fs(GtkWidget * dummy1,
-                                        GtkWidget * dummy2) {
-  GtkWidget * contentList;
-  GtkTreeModel * model;
 
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  model
-    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  clearContentList(model);
-}
-
-void on_localNamespacesNotebook_destroy_fs(GtkWidget * dummy1,
-                                           GtkWidget * dummy2) {
-  NamespaceList * pos;
+void on_localNamespaceContentFrameTreeView_destroy_fs(GtkWidget * tree,
+                                                      GtkWidget * dummy2) {  
   GtkTreeIter iter;
   struct ECRS_URI * u;
   struct ECRS_MetaData * m;
-
-  while (head != NULL) {
-    pos = head->next;
-    FREE(head->name);
-    ECRS_freeMetaData(head->meta);
-
-    if (gtk_tree_model_get_iter_first(head->model,
-                                      &iter)) {
-      do {
-        gtk_tree_model_get(head->model,
-                           &iter,
-                           IN_NAMESPACE_URI, &u,
-                           IN_NAMESPACE_META, &m,
-                           -1);
-        gtk_list_store_set(GTK_LIST_STORE(head->model),
-                           &iter,
-                           IN_NAMESPACE_URI, NULL,
-                           IN_NAMESPACE_META, NULL,
-                           -1);
-        if (u != NULL)
-          ECRS_freeUri(u);
-        if (m != NULL)
-          ECRS_freeMetaData(m);
-      } while (gtk_tree_model_iter_next(head->model,
-                                        &iter));
-    }
-    FREE(head);
-    head = pos;
+  NamespaceList * prev;
+  NamespaceList * pos;
+  NamespaceList * next;
+
+  pos = head;
+  while (pos != NULL) {
+    next = pos->next;
+    if (pos->treeview == tree) 
+      break;
+    prev = pos;
+    pos = next;
+  }
+  if (pos == NULL) {
+    GE_BREAK(NULL, 0);
+    return; 
+  }
+  if (prev == NULL)
+    head = pos->next;
+  else
+    prev->next = pos->next;
+  FREE(pos->name);
+  ECRS_freeMetaData(pos->meta);
+  if (gtk_tree_model_get_iter_first(pos->model,
+                                    &iter)) {
+    do {
+      gtk_tree_model_get(pos->model,
+                         &iter,
+                         IN_NAMESPACE_URI, &u,
+                         IN_NAMESPACE_META, &m,
+                         -1);
+      gtk_list_store_set(GTK_LIST_STORE(pos->model),
+                         &iter,
+                         IN_NAMESPACE_URI, NULL,
+                         IN_NAMESPACE_META, NULL,
+                         -1);
+      if (u != NULL)
+        ECRS_freeUri(u);
+      if (m != NULL)
+        ECRS_freeMetaData(m);
+    } while (gtk_tree_model_iter_next(pos->model,
+                                      &iter));
   }
+  FREE(pos);
 }
-#endif
 
 void fs_namespace_stop() {
   URITRACK_unregisterTrackCallback(&updateViewSave,
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
new file mode 100644
index 00000000..f5f7b1d8
--- /dev/null
+++ b/src/plugins/fs/namespace_search.c
@@ -0,0 +1,187 @@
+/*
+     This file is part of GNUnet.
+     (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
+     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/namespace_search.c
+ * @brief code for namespace-related operations on the search frame
+ * @author Christian Grothoff
+ */
+
+#include "platform.h"
+#include "gnunetgtk_common.h"
+#include "fs.h"
+#include "helper.h"
+#include "meta.h"
+#include <GNUnet/gnunet_util_crypto.h>
+#include <GNUnet/gnunet_uritrack_lib.h>
+#include <GNUnet/gnunet_namespace_lib.h>
+#include <extractor.h>
+
+
+/**
+ * The spin button giving the rating for a particular namespace
+ * has been changed.  Store the new rating for the namespace.
+ */
+void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy,
+                                             GtkWidget * dummy2) {
+  GtkWidget * spin;
+  GtkWidget * ncbe;
+  GtkTreeModel * model;
+  GtkTreeIter iter;
+  char * encStr;
+  char * description;
+  int rating;
+  int newrating;
+
+  DEBUG_BEGIN();
+  spin
+    = glade_xml_get_widget(getMainXML(),
+                           "namespaceRatingSpinButton");
+  ncbe
+    = glade_xml_get_widget(getMainXML(),
+                           "searchNamespaceComboBoxEntry");
+  model = gtk_combo_box_get_model(GTK_COMBO_BOX(ncbe));
+  description = NULL;
+  encStr = 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_RATING, &rating,
+                       -1);
+    if ( (description != NULL) &&
+         (0 == strcmp(description,
+                      _("globally"))) ) {
+      /* just to be sure */
+      gtk_widget_set_sensitive(spin,
+                               FALSE);
+    } else {
+      if (encStr != NULL) {
+        newrating = gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin));
+        rating = NS_rankNamespace(ectx,
+                                  cfg,
+                                  encStr,
+                                  newrating - rating);
+        if (rating != newrating) {
+          /* concurrent modification? */
+          gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
+                                    rating);
+          GE_BREAK(ectx, 0);    
+        }
+        gtk_list_store_set(GTK_LIST_STORE(model),
+                           &iter,
+                           NS_SEARCH_RATING, rating,
+                           -1);
+      }
+    }
+  } else {
+    /* FIXME: if enc2hash succeeds, we may want to keep this
+       active */
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
+                              0);
+    gtk_widget_set_sensitive(spin,
+                             FALSE);
+  }
+  if (description != NULL)
+    free(description);
+  if (encStr != NULL)
+    free(encStr);
+  DEBUG_END();
+}
+
+
+/**
+ * The namespace in the search window has changed.
+ * Update the trust level (possibly changing sensitivity)
+ * and set the search string to the root (if available).
+ */
+void on_searchNamespaceComboBoxEntry_changed_fs(GtkWidget * dummy,
+                                                GtkWidget * dummy2) {
+  GtkWidget * keyword;
+  GtkWidget * spin;
+  GtkWidget * ncbe;
+  GtkTreeModel * model;
+  GtkTreeIter iter;
+  int rating;
+  char * encStr;
+  char * descStr;
+  HashCode512 ns;
+  HashCode512 root;
+  EncName enc;
+
+  DEBUG_BEGIN();
+  spin
+    = glade_xml_get_widget(getMainXML(),
+                           "namespaceRatingSpinButton");
+  ncbe
+    = glade_xml_get_widget(getMainXML(),
+                           "searchNamespaceComboBoxEntry");
+  model = gtk_combo_box_get_model(GTK_COMBO_BOX(ncbe));
+  descStr = NULL;
+  encStr = 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_RATING, &rating,
+                       -1);
+    if ( (descStr != NULL) &&
+         (0 == strcmp(descStr,
+                      _("globally"))) ) {
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
+                                0);
+      gtk_widget_set_sensitive(spin,
+                               FALSE);
+    } else if (encStr != NULL) {
+      enc2hash(encStr,
+               &ns);
+      gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
+                                rating);
+      gtk_widget_set_sensitive(spin,
+                               TRUE);
+      if (OK == NS_getNamespaceRoot(ectx,
+                                    cfg,
+                                    encStr,
+                                    &root)) {
+        hash2enc(&root,
+                 &enc);
+        keyword
+          = glade_xml_get_widget(getMainXML(),
+                                 "fssearchKeywordComboBoxEntry");
+        gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(keyword))),
+                           (const gchar*) &enc);
+      }
+    }
+  } else {
+    gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin),
+                              0);
+    gtk_widget_set_sensitive(spin,
+                             FALSE);
+  }
+  if (descStr != NULL)
+    free(descStr);
+  if (encStr != NULL)
+    free(encStr);
+  DEBUG_END();
+}