1 files changed, 32 insertions, 30 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 9985c4c3..e06a9204 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.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
@@ -192,8 +192,6 @@ static void freeIterSubtree(GtkTreeModel * tree,
       freeIterSubtree(tree, &child);
   } while (gtk_tree_model_iter_next(tree,
                                     iter));
-
-                                
 }
 
 /**
@@ -1025,6 +1023,36 @@ void fs_search_start() {
                     NULL);
 }
 
+static void freeSearchModel(GtkTreeModel * model,
+                            GtkTreeIter * parent) {
+  struct ECRS_URI * u;
+  struct ECRS_MetaData * m;
+  GtkTreeIter iter;
+
+  if (gtk_tree_model_iter_children(model,
+                                   &iter,
+                                   parent)) {
+    do {
+      gtk_tree_model_get(model,
+                         &iter,
+                         SEARCH_URI, &u,
+                         SEARCH_META, &m,
+                         -1);
+      gtk_tree_store_set(GTK_TREE_STORE(model),
+                         &iter,
+                         SEARCH_URI, NULL,
+                         SEARCH_META, NULL,
+                         -1);
+      if (u != NULL)
+        ECRS_freeUri(u);
+      if (m != NULL)
+        ECRS_freeMetaData(m);
+      freeSearchModel(model, &iter);
+    } while (gtk_tree_model_iter_next(model,
+                                      &iter));
+  }  
+}
+
 void fs_search_stop() {
   SearchList * list;
   GtkTreeIter iter;
@@ -1037,33 +1065,7 @@ void fs_search_stop() {
     list = head;
     head = head->next;
     ECRS_freeUri(list->uri);
-
-#if 0
-  /* FIXME - memory leak.  The following is still incorrect;
-     it does not free entire tree (need to recurse!)
-  */
-    if (gtk_tree_model_get_iter_first(head->model,
-                                      &iter)) {
-      struct ECRS_MetaData * m;
-      do {
-        gtk_tree_model_get(head->model,
-                           &iter,
-                           SEARCH_URI, &u,
-                           SEARCH_META, &m,
-                           -1);
-        gtk_tree_store_set(GTK_TREE_STORE(head->model),
-                           &iter,
-                           SEARCH_URI, NULL,
-                           SEARCH_META, NULL,
-                           -1);
-        if (u != NULL)
-          ECRS_freeUri(u);
-        if (m != NULL)
-          ECRS_freeMetaData(m);
-      } while (gtk_tree_model_iter_next(head->model,
-                                        &iter));
-    }
-#endif
+    freeSearchModel(list->model, NULL);
     FREE(list);
   }