1 files changed, 6 insertions, 4 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);
 }