1 files changed, 9 insertions, 13 deletions

diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 0ba02840..ff3f361c 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -156,7 +156,8 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
                     const ECRS_FileInfo * fi,
                     const char * filename,
                     unsigned long long completed,
-                    cron_t eta) {
+                    cron_t eta,
+                    FSUI_State state) {
   DownloadList * list;
   GtkTreeIter iter;
   GtkTreePath * path;
@@ -265,6 +266,8 @@ fs_download_started(struct FSUI_DownloadList * fsui_dl,
   list->fsui_list = fsui_dl;
   list->total = total;
   list->is_directory = ECRS_isDirectory(fi->meta);
+  list->has_terminated = ( (state != FSUI_ACTIVE) &&
+                           (state != FSUI_PENDING) );
   list->next = download_head;
   download_head = list;
   if ( (list->is_directory == YES) &&
@@ -658,7 +661,7 @@ static void * fsui_callback(void * cls) {
   return NULL;
 }
 
-static void 
+static gboolean 
 clearCompletedDownloadCallback(GtkTreeModel * model,
                                GtkTreePath * path,
                                GtkTreeIter * iter,
@@ -678,21 +681,14 @@ clearCompletedDownloadCallback(GtkTreeModel * model,
     run_with_save_calls(&fsui_callback,
                         &fcbc);
   }
+  return FALSE;
 }
 
 void on_clearCompletedDownloadsButton_clicked_fs(void * unused,
                                                  GtkWidget * clearButton) { 
-  GtkTreeSelection * selection;
-  GtkWidget * downloadList;
-
-  downloadList = glade_xml_get_widget(getMainXML(),
-                                      "activeDownloadsList");
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
-  
-  ggc_tree_selection_selected_foreach
-    (selection,
-     &clearCompletedDownloadCallback,
-     NULL);
+  gtk_tree_model_foreach(GTK_TREE_MODEL(download_summary),
+                         &clearCompletedDownloadCallback,
+                         NULL);
 }
 
 static void