1 files changed, 10 insertions, 12 deletions

diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 71c3083a..329e085d 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -135,7 +135,8 @@ fs_upload_started(struct FSUI_UploadList * fsui,
                   const char * filename,
                   struct ECRS_URI * uri,
                   unsigned long long total,
-                  unsigned long long completed) {
+                  unsigned long long completed,
+                  FSUI_State state) {
   UploadList * ret;
   GtkTreeIter iter;
   GtkTreePath * path;
@@ -181,6 +182,9 @@ fs_upload_started(struct FSUI_UploadList * fsui,
   ret->summaryViewRowReference
     = gtk_tree_row_reference_new(GTK_TREE_MODEL(upload_summary),
                                  path);
+  ret->has_terminated = ( (state != FSUI_ACTIVE) &&
+                          (state != FSUI_PENDING) );
+
   ret->next = upload_head;
   upload_head = ret;
   return ret;
@@ -415,7 +419,7 @@ static void * fsui_callback(void * cls) {
   return NULL;
 }
 
-static void 
+static gboolean
 clearCompletedUploadCallback(GtkTreeModel * model,
                              GtkTreePath * path,
                              GtkTreeIter * iter,
@@ -435,20 +439,14 @@ clearCompletedUploadCallback(GtkTreeModel * model,
     run_with_save_calls(&fsui_callback,
                         &fcbc);
   }
+  return FALSE;
 }
 
 void on_clearCompletedUploadsButton_clicked_fs(void * unused,
                                                GtkWidget * clearButton) { 
-  GtkTreeSelection * selection;
-  GtkWidget * uploadList;
-
-  uploadList = glade_xml_get_widget(getMainXML(),
-                                    "activeUploadsList");
-  selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(uploadList));
-  ggc_tree_selection_selected_foreach
-    (selection,
-     &clearCompletedUploadCallback,
-     NULL);
+  gtk_tree_model_foreach(GTK_TREE_MODEL(upload_summary),
+                         &clearCompletedUploadCallback,
+                         NULL);
 }
 
 static void