[GNUnet-SVN] r5739 - GNUnet/src/applications/fs/fsui

[gnunet]

Author: grothoff
Date: 2007-11-22 19:30:28 -0700 (Thu, 22 Nov 2007)
New Revision: 5739

Modified:
   GNUnet/src/applications/fs/fsui/upload.c
Log:
fix

Modified: GNUnet/src/applications/fs/fsui/upload.c
===================================================================
--- GNUnet/src/applications/fs/fsui/upload.c    2007-11-23 02:18:33 UTC (rev 
5738)
+++ GNUnet/src/applications/fs/fsui/upload.c    2007-11-23 02:30:28 UTC (rev 
5739)
@@ -47,7 +47,8 @@
 progressCallbackR (unsigned long long totalBytes,
                   unsigned long long completedBytes, cron_t eta, void *ptr,
                   int direct,
-                  int add)
+                  int add,
+                  int unaccounted)
 {
   FSUI_UploadList *utc = ptr;
   FSUI_Event event;
@@ -62,11 +63,13 @@
   event.data.UploadProgress.uc.ppos = utc->parent;
   event.data.UploadProgress.uc.pcctx = utc->parent->cctx;
   if (YES == ECRS_isDirectory(utc->meta)) {
+    if (direct == YES)
+      unaccounted = YES;
     if ( (direct == YES) && (totalBytes == completedBytes) ) 
       add = YES;
     if (add == NO) {
       event.data.UploadProgress.completed = completedBytes + utc->completed;
-      event.data.UploadProgress.total = utc->total;
+      event.data.UploadProgress.total = utc->total + ((unaccounted == NO) ? 0 
: totalBytes);
       if (totalBytes == completedBytes) 
        utc->completed += completedBytes;
     } else {
@@ -104,7 +107,7 @@
                            (double) utc->parent->total);
         }
       progressCallbackR (totalBytes, completedBytes, xeta, utc->parent,
-                        NO, add);
+                        NO, add, unaccounted);
     }
 }
 
@@ -115,7 +118,7 @@
 progressCallback (unsigned long long totalBytes,
                   unsigned long long completedBytes, cron_t eta, void *ptr) 
 {
-  progressCallbackR(totalBytes, completedBytes, eta, ptr, YES, NO);
+  progressCallbackR(totalBytes, completedBytes, eta, ptr, YES, NO, NO);
 }
 
 static int