[GNUnet-SVN] r5738 - gnunet-gtk/src/plugins/fs

[gnunet]

Author: grothoff
Date: 2007-11-22 19:18:33 -0700 (Thu, 22 Nov 2007)
New Revision: 5738

Modified:
   gnunet-gtk/src/plugins/fs/fs.c
   gnunet-gtk/src/plugins/fs/upload.c
   gnunet-gtk/src/plugins/fs/upload.h
Log:
fixing Mantis 1290

Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c      2007-11-23 02:18:12 UTC (rev 5737)
+++ gnunet-gtk/src/plugins/fs/fs.c      2007-11-23 02:18:33 UTC (rev 5738)
@@ -211,7 +211,8 @@
       /* upload events */
     case FSUI_upload_progress:
       fs_upload_update (event->data.UploadProgress.uc.cctx,
-                        event->data.UploadProgress.completed);
+                        event->data.UploadProgress.completed,
+                       event->data.UploadProgress.total);
       break;
     case FSUI_upload_completed:
       fs_upload_complete (event->data.UploadCompleted.uc.cctx,

Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c  2007-11-23 02:18:12 UTC (rev 5737)
+++ gnunet-gtk/src/plugins/fs/upload.c  2007-11-23 02:18:33 UTC (rev 5738)
@@ -49,12 +49,14 @@
 /* ************ 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 @@
   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 @@
   GtkTreePath *path;
   int progress;
   GtkTreeIter par;
+  char * u;
 
   ret = MALLOC (sizeof (UploadList));
   memset (ret, 0, sizeof (UploadList));
@@ -156,12 +162,17 @@
     {
       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);

Modified: gnunet-gtk/src/plugins/fs/upload.h
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.h  2007-11-23 02:18:12 UTC (rev 5737)
+++ gnunet-gtk/src/plugins/fs/upload.h  2007-11-23 02:18:33 UTC (rev 5738)
@@ -29,7 +29,8 @@
 
 #include "fs.h"
 
-void fs_upload_update (UploadList * list, unsigned long long completed);
+void fs_upload_update (UploadList * list, unsigned long long completed,
+                      unsigned long long total);
 
 void fs_upload_complete (UploadList * list, struct ECRS_URI *uri);