1 files changed, 15 insertions, 4 deletions

diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 071d64f1..4738d2f3 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -49,12 +49,14 @@ static GladeXML *metaXML;
 /* ************ FSUI event handlers ************ */
 
 void
-fs_upload_update (UploadList * list, unsigned long long completed)
+fs_upload_update (UploadList * list, unsigned long long completed,
+                  unsigned long long total)
 {
   GtkTreeIter iter;
   GtkTreePath *path;
   int progress;
 
+  list->total = total;
   if (list->total != 0)
     progress = 100 * completed / list->total;
   else
@@ -78,7 +80,10 @@ fs_upload_complete (UploadList * list, struct ECRS_URI *uri)
   path = gtk_tree_row_reference_get_path (list->summaryViewRowReference);
   gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
   gtk_tree_path_free (path);
-  gtk_tree_store_set (upload_summary, &iter, UPLOAD_URISTRING, us, -1);
+  gtk_tree_store_set (upload_summary, &iter,
+                      UPLOAD_URISTRING, us,
+                      UPLOAD_PROGRESS, 100, 
+                      -1);
   FREE (us);
 }
 
@@ -136,6 +141,7 @@ fs_upload_started (struct FSUI_UploadList *fsui,
   GtkTreePath *path;
   int progress;
   GtkTreeIter par;
+  char * u;
 
   ret = MALLOC (sizeof (UploadList));
   memset (ret, 0, sizeof (UploadList));
@@ -156,12 +162,17 @@ fs_upload_started (struct FSUI_UploadList *fsui,
     {
       gtk_tree_store_append (upload_summary, &iter, NULL);
     }
-  if (total != 0)
+  if ( (total != 0) && (state != FSUI_COMPLETED_JOINED) )
     progress = 100 * completed / total;
   else
     progress = 100;
-  gtk_tree_store_set (upload_summary, &iter, UPLOAD_FILENAME, filename, UPLOAD_PROGRESS, progress, UPLOAD_URISTRING, "",        /* FIXME: set if URI != NULL! */
+  if (uri != NULL)
+    u = ECRS_uriToString(uri);
+  else
+    u = STRDUP("");
+  gtk_tree_store_set (upload_summary, &iter, UPLOAD_FILENAME, filename, UPLOAD_PROGRESS, progress, UPLOAD_URISTRING, u,
                       UPLOAD_INTERNAL, ret, -1);
+  FREE(u);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (upload_summary), &iter);
   ret->summaryViewRowReference
     = gtk_tree_row_reference_new (GTK_TREE_MODEL (upload_summary), path);