fixing memory leaks from 686 and then some

3 files changed, 64 insertions, 4 deletions

diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index 81aa9791..821f0213 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -173,6 +173,7 @@ void fs_collection_start() {
 }
 
 void fs_collection_stop() {
+  /* nothing to do */
 }
 
 /* end of collection.c */
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 0b3954d8..f627dfb1 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -497,10 +497,11 @@ void fs_download_start() {
 }
 
 
-
 void fs_download_stop() {
   GtkTreeIter iter;
   struct ECRS_URI * u;
+  struct ECRS_MetaData * m;
+  DownloadList * pos;
 
   /* free URIs in summary model */
   if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(summary),
@@ -517,10 +518,36 @@ void fs_download_stop() {
                        -1);  
     if (u != NULL)
       ECRS_freeUri(u);
-    /* FIXME:
-       also free DOWNLOAD_TREEPATH! */
   } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(summary),
                                     &iter));
+  while (head != NULL) {
+    pos = head->next;
+    ECRS_freeUri(head->uri);
+    FREE(head->filename);
+    gtk_tree_row_reference_free(head->rr);
+    if (gtk_tree_model_get_iter_first(head->model,
+                                      &iter)) {
+      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));
+    }
+    FREE(head);
+    head = pos;
+  }
 }
 
 
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index 468d9a86..564a9fe6 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -868,7 +868,39 @@ void fs_namespace_start() {
 }
 
 void fs_namespace_stop() {
-  /* FIXME: free memory! */
+  NamespaceList * pos;
+  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;
+  }
 
   delCronJob(&updateContentList,
              5 * cronMINUTES,