updated to use the new set of progress-functions

4 files changed, 34 insertions, 3 deletions

diff --git a/lib/dict.c b/lib/dict.c
index 99abf49f6..cf604ec5b 100644
--- a/lib/dict.c
+++ b/lib/dict.c
@@ -243,6 +243,10 @@ UrgError dict(struct UrlData *data, char *path, long *bytecount)
     }
   }
 
+#if 0
   ProgressEnd(data);
+#endif
+  pgrsDone(data);
+
   return URG_OK;
 }
diff --git a/lib/file.c b/lib/file.c
index b5d198e57..99759f477 100644
--- a/lib/file.c
+++ b/lib/file.c
@@ -145,7 +145,12 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
      this is both more efficient than the former call to download() and
      it avoids problems with select() and recv() on file descriptors
      in Winsock */
+#if 0
   ProgressInit (data, expected_size);
+#endif
+  if(expected_size != -1)
+    pgrsSetDownloadSize(data, expected_size);
+
   while (1) {
     nread = read(fd, buf, BUFSIZE-1);
 
@@ -164,10 +169,16 @@ UrgError file(struct UrlData *data, char *path, long *bytecountp)
       return URG_WRITE_ERROR;
     }
     now = tvnow();
+    pgrsUpdate(data);
+#if 0
     ProgressShow (data, bytecount, start, now, FALSE);
+#endif
   }
   now = tvnow();
+#if 0
   ProgressShow (data, bytecount, start, now, TRUE);
+#endif
+  pgrsUpdate(data);
 
   close(fd);
 
diff --git a/lib/ftp.c b/lib/ftp.c
index da67ecb86..e3da49179 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -752,7 +752,10 @@ UrgError _ftp(struct UrlData *data,
     /* When we know we're uploading a specified file, we can get the file
        size prior to the actual upload. */
 
+    pgrsSetUploadSize(data, data->infilesize);
+#if 0
     ProgressInit(data, data->infilesize);
+#endif
     result = Transfer(data, -1, -1, FALSE, NULL, /* no download */
                       data->secondarysocket, bytecountp);
     if(result)
@@ -999,7 +1002,10 @@ UrgError _ftp(struct UrlData *data,
 	
   }
   /* end of transfer */
+#if 0
   ProgressEnd(data);
+#endif
+  pgrsDone(data);
 
   /* shut down the socket to inform the server we're done */
   sclose(data->secondarysocket);
diff --git a/lib/http.c b/lib/http.c
index c37318d8f..bf89d97b0 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -317,8 +317,11 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
         sendf(data->firstsocket, data,
               "Content-Length: %d\r\n",
               postsize-2);
-	
+
+	pgrsSetUploadSize(data, postsize);
+#if 0
         ProgressInit(data, postsize);
+#endif
 
         result = Transfer(data, data->firstsocket, -1, TRUE, &readbytecount,
                           data->firstsocket, &writebytecount);
@@ -348,8 +351,11 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
       else
         sendf(data->firstsocket, data,
               "\015\012");
-        
+
+#if 0        
       ProgressInit(data, data->infilesize);
+#endif
+      pgrsSetUploadSize(data, data->infilesize);
 
       result = Transfer(data, data->firstsocket, -1, TRUE, &readbytecount,
                         data->firstsocket, &writebytecount);
@@ -370,8 +376,12 @@ UrgError http(struct UrlData *data, char *ppath, char *host, long *bytecount)
     }
     if(result)
       return result;
-      
+
+#if 0      
     ProgressEnd(data);
+#endif
+    pgrsDone(data);
+
   } while (0); /* this is just a left-over from the multiple document download
                   attempts */