aboutsummaryrefslogtreecommitdiffstats
path: root/camel/camel-remote-store.c
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2001-02-08 09:42:53 +0800
committerMichael Zucci <zucchi@src.gnome.org>2001-02-08 09:42:53 +0800
commit49f8a687a41e635cd83807d33c74afe8e55fb3df (patch)
tree4162f19a2db18ff787386c7c97a98e5e8a5e7744 /camel/camel-remote-store.c
parent1290da3f286a31745b1814610c16918c2e84e140 (diff)
downloadgsoc2013-evolution-49f8a687a41e635cd83807d33c74afe8e55fb3df.tar.gz
gsoc2013-evolution-49f8a687a41e635cd83807d33c74afe8e55fb3df.tar.zst
gsoc2013-evolution-49f8a687a41e635cd83807d33c74afe8e55fb3df.zip
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
Diffstat (limited to 'camel/camel-remote-store.c')
-rw-r--r--camel/camel-remote-store.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/camel/camel-remote-store.c b/camel/camel-remote-store.c
index e81ef5e91e..d1352300b7 100644
--- a/camel/camel-remote-store.c
+++ b/camel/camel-remote-store.c
@@ -36,8 +36,6 @@
#include <unistd.h>
#include <errno.h>
-#include <gal/util/e-util.h>
-
#include "camel-remote-store.h"
#include "camel-folder.h"
#include "camel-exception.h"
@@ -49,6 +47,7 @@
#include "string-utils.h"
#include "camel-private.h"
+#include "camel-operation.h"
#define d(x) x
#if d(!)0
@@ -202,7 +201,7 @@ timeout_cb (gpointer data)
return TRUE;
}
-/* this is a 'cancellable' connect, cancellable from camel_cancel etc */
+/* this is a 'cancellable' connect, cancellable from camel_operation_cancel etc */
/* returns -1 & errno == EINTR if the connection was cancelled */
static int socket_connect(struct hostent *h, int port)
{
@@ -214,7 +213,7 @@ static int socket_connect(struct hostent *h, int port)
int cancel_fd;
/* see if we're cancelled yet */
- if (camel_cancel_check(NULL)) {
+ if (camel_operation_cancel_check(NULL)) {
errno = EINTR;
return -1;
}
@@ -226,7 +225,7 @@ static int socket_connect(struct hostent *h, int port)
fd = socket (h->h_addrtype, SOCK_STREAM, 0);
- cancel_fd = camel_cancel_fd(NULL);
+ cancel_fd = camel_operation_cancel_fd(NULL);
if (cancel_fd == -1) {
ret = connect(fd, (struct sockaddr *)&sin, sizeof (sin));
if (ret == -1) {