1 files changed, 29 insertions, 65 deletions

diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 88d9ec86..57520198 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -35,8 +35,6 @@
 #include <GNUnet/gnunet_namespace_lib.h>
 #include <extractor.h>
 
-#define UPDATE_CONTENT_LIST_FREQUENCY (5 * cronMINUTES)
-
 /**
  * @brief linked list of pages in the search notebook
  */
@@ -241,32 +239,21 @@ static GtkWidget * makeNamespaceFrame(GtkWidget ** treeview,
  * content model.  Check that it is not already
  * present!
  */
-static int updateView(const ECRS_FileInfo * fi,
-                      const HashCode512 * key,
-                      int isRoot,
-                      void * closure) {
-  GtkTreeModel * model = GTK_TREE_MODEL(closure);
-  struct ECRS_URI * euri;
+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;
 
-  DEBUG_BEGIN();
-  if (gtk_tree_model_get_iter_first(model,
-                                    &iter)) {
-    do {        
-      gtk_tree_model_get(model,
-                         &iter,
-                         NAMESPACE_URI, &euri,
-                         -1);
-      if (ECRS_equalsUri(euri,
-                         fi->uri))
-        return OK; /* already listed */
-    } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model),
-                                      &iter));
-  }
+  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,
@@ -309,10 +296,23 @@ static int updateView(const ECRS_FileInfo * fi,
   FREE(size_h);
   FREE(filename);
   FREE(uriString);
-  DEBUG_END();
+  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;
@@ -343,37 +343,6 @@ static void * clearContentList(void * mdl) {
 }
 
 /**
- * Update the list of the globally available content.
- */
-static void * doUpdateContentList(void * unused) {
-  GtkWidget * contentList;
-  GtkTreeModel * model;
-
-  DEBUG_BEGIN();
-  contentList
-    = glade_xml_get_widget(getMainXML(),
-                           "availableContentList");
-  model
-    = gtk_tree_view_get_model(GTK_TREE_VIEW(contentList));
-  URITRACK_listURIs(ectx,
-                    cfg,
-                    YES,
-                    &updateView,
-                    model);
-  DEBUG_END();
-  return NULL;
-}
-
-static void updateContentList(void * unused) {
-  gtkSaveCall(&doUpdateContentList, NULL);
-}
-
-void on_refreshContentListButton_clicked_fs(gpointer dummy,
-                                            gpointer dummy1) {
-  updateContentList(NULL);
-}
-
-/**
  * Update the model that lists the content of a namespace:
  * add this content.
  *
@@ -1187,7 +1156,6 @@ void on_clearAvailableContentButton_clicked_fs(GtkWidget * dummy1,
   URITRACK_clearTrackedURIS(ectx,
                             cfg);
   gtkSaveCall(&clearContentList, model);
-  updateContentList(NULL);
   DEBUG_END();
 }
 
@@ -1428,13 +1396,10 @@ 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);
-#endif
+  URITRACK_registerTrackCallback(ectx,
+                                 cfg,
+                                 &updateViewSave,
+                                 NULL);
   NS_listNamespaces(ectx,
                     cfg,
                     YES,
@@ -1449,9 +1414,6 @@ void on_availableContentList_destroy_fs(GtkWidget * dummy1,
   GtkWidget * contentList;
   GtkTreeModel * model;
 
-  delCronJob(&updateContentList,
-             UPDATE_CONTENT_LIST_FREQUENCY,
-             NULL);
   contentList
     = glade_xml_get_widget(getMainXML(),
                            "availableContentList");
@@ -1499,6 +1461,8 @@ void on_localNamespacesNotebook_destroy_fs(GtkWidget * dummy1,
 #endif
 
 void fs_namespace_stop() {
+  URITRACK_unregisterTrackCallback(&updateViewSave,
+                                   NULL);
   /* FIXME: free resources! */
 }