Changed to push the operation into a status stack.

2001-02-07  Not Zed  <NotZed@Ximian.com>

        * camel-operation.c (camel_operation_start): Changed to push the
        operation into a status stack.
        (camel_operation_progress): Changed to only accept % complete.
        (camel_operation_reset): Free status stack as well.

        * providers/pop3/camel-pop3-folder.c (pop3_get_message): Get the
        octect count from the return line, and pass it to
        get_additional_data().
        (pop3_refresh_info): Added status stuff.

        * providers/pop3/camel-pop3-store.c
        (camel_pop3_command_get_additional_data): Added a total bytes
        expected argument for progress reporting & fixed callers.
        (camel_pop3_command_get_additional_data): Added progress
        reporting.

        * providers/local/camel-mbox-summary.c (mbox_summary_sync_full):
        (mbox_summary_sync_quick):
        (summary_rebuild): Added progress reporting stuff.

svn path=/trunk/; revision=8095

1 files changed, 5 insertions, 5 deletions

diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 1e2a6bdf55..d19000b37e 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -33,7 +33,7 @@
 #include <errno.h>
 #include <string.h>
 
-#include "camel-session.h"	/* for camel_cancel_* */
+#include "camel-operation.h"
 
 static CamelSeekableStreamClass *parent_class = NULL;
 
@@ -214,7 +214,7 @@ stream_read (CamelStream *stream, char *buffer, size_t n)
 	ssize_t nread;
 	int cancel_fd;
 
-	if (camel_cancel_check(NULL)) {
+	if (camel_operation_cancel_check(NULL)) {
 		errno = EINTR;
 		return  -1;
 	}
@@ -222,7 +222,7 @@ stream_read (CamelStream *stream, char *buffer, size_t n)
 	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
 		n = MIN (seekable->bound_end - seekable->position, n);
 
-	cancel_fd = camel_cancel_fd(NULL);
+	cancel_fd = camel_operation_cancel_fd(NULL);
 	if (cancel_fd == -1) {
 		do {
 			nread = read (stream_fs->fd, buffer, n);
@@ -263,7 +263,7 @@ stream_write (CamelStream *stream, const char *buffer, size_t n)
 	ssize_t v, written = 0;
 	int cancel_fd;
 
-	if (camel_cancel_check(NULL)) {
+	if (camel_operation_cancel_check(NULL)) {
 		errno = EINTR;
 		return  -1;
 	}
@@ -271,7 +271,7 @@ stream_write (CamelStream *stream, const char *buffer, size_t n)
 	if (seekable->bound_end != CAMEL_STREAM_UNBOUND)
 		n = MIN (seekable->bound_end - seekable->position, n);
 
-	cancel_fd = camel_cancel_fd(NULL);
+	cancel_fd = camel_operation_cancel_fd(NULL);
 	if (cancel_fd == -1) {
 		do {
 			v = write (stream_fs->fd, buffer+written, n-written);