3 files changed, 36 insertions, 19 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 7f243a3c..bdae8406 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -409,10 +409,11 @@ check_pending(const char * filename,
                          -1);
       if ( (name != NULL) &&
            (0 == strcmp(name, filename)) ) {
-        FREE(name);
+        free(name);
         return SYSERR;
       }
-      FREENONNULL(name);
+      if (name != NULL)
+        free(name);
       if (SYSERR == check_pending(filename,
                                   &iter))
         return SYSERR;
@@ -533,7 +534,7 @@ initiateDownload(GtkTreeModel * model,
   dirPath[0] = '\0';
   dirPathLen = 0;
   while (gtk_tree_path_get_depth(dirTreePath) > 1) {
-    const char * dirname;
+    char * dirname;
     char * new;
 
     if (! gtk_tree_path_up(dirTreePath))
@@ -555,6 +556,7 @@ initiateDownload(GtkTreeModel * model,
     strcat(new, dirPath);
     FREE(dirPath);
     dirPath = new;
+    free(dirname);
   }
   gtk_tree_path_free(dirTreePath);
 
@@ -733,7 +735,7 @@ clearCompletedDownloadCallback(GtkTreeModel * model,
 
 void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
                                                  GtkWidget * clearButton) {
-  gtk_tree_model_foreach(GTK_TREE_MODEL(download_summary),
+  ggc_tree_model_foreach(GTK_TREE_MODEL(download_summary),
                          &clearCompletedDownloadCallback,
                          NULL);
 }
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index faf02567..47f55a0b 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -1031,9 +1031,12 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
     GE_BREAK(ectx, 0);
     UNREF(metaXML);
     metaXML = NULL;
-    FREENONNULL(last);
-    FREENONNULL(next);
-    FREENONNULL(freq);
+    if (last != NULL)
+      free(last);
+    if (next != NULL)
+      free(next);
+    if (freq != NULL)
+      free(freq);
     return;
   }
   if (OK == enc2hash(last,
@@ -1066,9 +1069,12 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
       GE_BREAK(ectx, 0);
       UNREF(metaXML);
       metaXML = NULL;
-      FREENONNULL(last);
-      FREENONNULL(next);
-      FREENONNULL(freq);
+      if (last != NULL)
+        free(last);
+      if (next != NULL)
+        free(next);
+      if (freq != NULL)
+        free(freq);
       return;
     }
     hash2enc(&nextId,
@@ -1148,9 +1154,12 @@ void on_namespaceUpdateButton_clicked_fs(GtkWidget * dummy1,
   gtk_widget_destroy(dialog);
   UNREF(metaXML);
   metaXML = NULL;
-  FREENONNULL(last);
-  FREENONNULL(next);
-  FREENONNULL(freq);
+  if (last != NULL)
+    free(last);
+  if (next != NULL)
+    free(next);
+  if (freq != NULL)
+    free(freq);
   DEBUG_END();
 }
 
@@ -1248,8 +1257,10 @@ void on_namespaceRatingSpinButton_changed_fs(GtkWidget * dummy,
     gtk_widget_set_sensitive(spin,
                              FALSE);
   }
-  FREENONNULL(description);
-  FREENONNULL(encStr);
+  if (description != NULL)
+    free(description);
+  if (encStr != NULL)
+    free(encStr);
   DEBUG_END();
 }
 
@@ -1324,8 +1335,10 @@ void on_searchNamespaceComboBoxEntry_changed_fs(GtkWidget * dummy,
     gtk_widget_set_sensitive(spin,
                              FALSE);
   }
-  FREENONNULL(descStr);
-  FREENONNULL(encStr);
+  if (descStr != NULL)
+    free(descStr);
+  if (encStr != NULL)
+    free(encStr);
   DEBUG_END();
 }
 
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 916504a5..dcf513e1 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -551,8 +551,10 @@ void on_fssearchbutton_clicked_fs(gpointer dummy2,
       }
       FREE(ustring);
     }
-    FREENONNULL(descStr);
-    FREENONNULL(ns);
+    if (descStr != NULL)
+      free(descStr);
+    if (ns != NULL)
+      free(ns);
   }
   if (uri == NULL)
     uri = ECRS_parseCharKeywordURI(ectx, searchString);