changeset 3962:9f607c5685fd HEAD

And one more fix for append hang..
author Timo Sirainen <tss@iki.fi>
date Sun, 29 Jan 2006 14:33:13 +0200
parents 3a2d31358d55
children ccab957a03b3
files src/imap/cmd-append.c src/imap/imap-sync.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/imap/cmd-append.c	Sun Jan 29 14:21:06 2006 +0200
+++ b/src/imap/cmd-append.c	Sun Jan 29 14:33:13 2006 +0200
@@ -126,8 +126,6 @@
 		mailbox_close(&ctx->box);
 
 	ctx->client->bad_counter = 0;
-	/* reset command so that flush callback gets changed back to normal. */
-	_client_reset_command(ctx->client);
 }
 
 static bool cmd_append_continue_cancel(struct client_command_context *cmd)
--- a/src/imap/imap-sync.c	Sun Jan 29 14:21:06 2006 +0200
+++ b/src/imap/imap-sync.c	Sun Jan 29 14:33:13 2006 +0200
@@ -216,6 +216,10 @@
 		return TRUE;
 	}
 
+	/* make sure that flush callback gets set to normal. this is
+	   currently needed only with APPEND. */
+	_client_reset_command(cmd->client);
+
 	if ((client_workarounds & WORKAROUND_DELAY_NEWMAIL) != 0 &&
 	    (flags & MAILBOX_SYNC_FLAG_FAST) != 0) {
 		/* expunges might break just as badly as new mail