bugfixes

7 files changed, 39 insertions, 37 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 
diff --git a/src/plugins/fs/download.h b/src/plugins/fs/download.h
index e639b9e7..d03be966 100644
--- a/src/plugins/fs/download.h
+++ b/src/plugins/fs/download.h
@@ -40,7 +40,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);
 
 void fs_download_update(DownloadList * downloadContext,
                         unsigned long long completed,
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index f2a687a7..fb819df1 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -63,7 +63,8 @@ saveEventProcessor(void * cls) {
                             event->data.SearchStarted.searchURI,
                             event->data.SearchStarted.anonymityLevel,
                             0,
-                            NULL);
+                            NULL,
+                            FSUI_ACTIVE);
     break;
   case FSUI_search_result:
     fs_search_result_received(event->data.SearchResult.sc.cctx,
@@ -88,7 +89,8 @@ saveEventProcessor(void * cls) {
                             event->data.SearchResumed.searchURI,
                             event->data.SearchResumed.anonymityLevel,
                             event->data.SearchResumed.fisSize,
-                            event->data.SearchResumed.fis);
+                            event->data.SearchResumed.fis,
+                            event->data.SearchResumed.state);
     break;
   case FSUI_search_stopped:
     fs_search_stopped(event->data.SearchStopped.sc.cctx);
@@ -126,7 +128,8 @@ saveEventProcessor(void * cls) {
                               &event->data.DownloadStarted.fi,
                               event->data.DownloadStarted.filename,
                               0,
-                              get_time());
+                              get_time(),
+                              FSUI_ACTIVE);
     break;
   case FSUI_download_resumed:
     ret = fs_download_started(event->data.DownloadResumed.dc.pos,
@@ -137,7 +140,8 @@ saveEventProcessor(void * cls) {
                               &event->data.DownloadResumed.fi,
                               event->data.DownloadResumed.filename,
                               event->data.DownloadResumed.completed,
-                              event->data.DownloadResumed.eta);
+                              event->data.DownloadResumed.eta,
+                              event->data.DownloadResumed.state);
     break;
 
     /* upload events */
@@ -173,7 +177,8 @@ saveEventProcessor(void * cls) {
                             event->data.UploadStarted.filename,
                             NULL,
                             event->data.UploadStarted.total,
-                            0);
+                            0,
+                            FSUI_ACTIVE);
     break;
   case FSUI_upload_resumed:
     printf("FSUI: Upload resumed\n");
@@ -182,9 +187,9 @@ saveEventProcessor(void * cls) {
                             event->data.UploadResumed.filename,
                             NULL, /* FIXME: maybe completed!? */
                             event->data.UploadResumed.total,
-                            event->data.UploadResumed.completed);
+                            event->data.UploadResumed.completed,
+                            event->data.UploadResumed.state);
     break;
-
     /* TODO: unindex events */
   default:
     GE_BREAK(ectx, 0);
@@ -374,7 +379,6 @@ static void fs_summary_start() {
   gtk_tree_view_column_set_resizable(gtk_tree_view_get_column(uploadList,
                                                               col - 1),
                                      TRUE);
-
   /* upload entry setup */
   uploadEntry
     = glade_xml_get_widget(getMainXML(),
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 533baaf6..402aa1c1 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -147,7 +147,8 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
                   const struct ECRS_URI * uri,
                   unsigned int anonymityLevel,
                   unsigned int resultCount,
-                  const ECRS_FileInfo * results) {
+                  const ECRS_FileInfo * results,
+                  FSUI_State state) {
   SearchList * list;
   gint pages;
   char * description;
diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index 5b72aafd..a0e32f1b 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -63,7 +63,8 @@ fs_search_started(struct FSUI_SearchList * list,
                   const struct ECRS_URI * uri,
                   unsigned int anonymityLevel,
                   unsigned int resultCount,
-                  const ECRS_FileInfo * results);
+                  const ECRS_FileInfo * results,
+                  FSUI_State state);
 
 /**
  * A search process has been aborted.  Update display.
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 
diff --git a/src/plugins/fs/upload.h b/src/plugins/fs/upload.h
index 55bca7f6..38db6ddb 100644
--- a/src/plugins/fs/upload.h
+++ b/src/plugins/fs/upload.h
@@ -48,6 +48,7 @@ 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);
 
 #endif