[dovecot-cvs] dovecot/src/imap cmd-fetch.c, 1.27, 1.28 common.h, 1.18, 1.19 imap-sync.c, 1.8, 1.9 main.c, 1.60, 1.61

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv20435/src/imap

Modified Files:
	cmd-fetch.c common.h imap-sync.c main.c 
Log Message:
Renamed oe6-fetch-no-newmail workaround to delay-newmail and changed it to
work more like the name says: only newmail notifications are skipped and
not only for FETCH command.



Index: cmd-fetch.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-fetch.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmd-fetch.c	11 Feb 2005 18:14:59 -0000	1.27
+++ cmd-fetch.c	14 Mar 2005 21:17:58 -0000	1.28
@@ -102,14 +102,9 @@
 		return TRUE;
 	}
 
-	if ((client_workarounds & WORKAROUND_OE6_FETCH_NO_NEWMAIL) != 0) {
-		client_send_tagline(cmd, ok_message);
-		return TRUE;
-	} else {
-		return cmd_sync(cmd, MAILBOX_SYNC_FLAG_FAST |
-				(cmd->uid ? 0 : MAILBOX_SYNC_FLAG_NO_EXPUNGES),
-				ok_message);
-	}
+	return cmd_sync(cmd, MAILBOX_SYNC_FLAG_FAST |
+			(cmd->uid ? 0 : MAILBOX_SYNC_FLAG_NO_EXPUNGES),
+			ok_message);
 }
 
 static int cmd_fetch_continue(struct client_command_context *cmd)

Index: common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/common.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- common.h	20 Oct 2004 18:09:32 -0000	1.18
+++ common.h	14 Mar 2005 21:17:58 -0000	1.19
@@ -24,7 +24,7 @@
 #define DEFAULT_MAX_KEYWORD_LENGTH 50
 
 enum client_workarounds {
-	WORKAROUND_OE6_FETCH_NO_NEWMAIL		= 0x01,
+	WORKAROUND_DELAY_NEWMAIL		= 0x01,
 	WORKAROUND_OUTLOOK_IDLE			= 0x02,
 	WORKAROUND_NETSCAPE_EOH			= 0x04,
 	WORKAROUND_TB_NEGATIVE_FETCH		= 0x08

Index: imap-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/imap-sync.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- imap-sync.c	5 Feb 2005 18:07:26 -0000	1.8
+++ imap-sync.c	14 Mar 2005 21:17:58 -0000	1.9
@@ -190,6 +190,10 @@
 		return TRUE;
 	}
 
+	if ((client_workarounds & WORKAROUND_DELAY_NEWMAIL) != 0 &&
+	    (flags & MAILBOX_SYNC_FLAG_FAST) != 0)
+		flags |= MAILBOX_SYNC_FLAG_NO_NEWMAIL;
+
 	ctx = p_new(cmd->pool, struct cmd_sync_context, 1);
 	ctx->tagline = p_strdup(cmd->pool, tagline);
 	ctx->sync_ctx = imap_sync_init(cmd->client, cmd->client->mailbox,

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- main.c	29 Dec 2004 19:24:00 -0000	1.60
+++ main.c	14 Mar 2005 21:17:58 -0000	1.61
@@ -29,7 +29,7 @@
 };
 
 struct client_workaround_list client_workaround_list[] = {
-	{ "oe6-fetch-no-newmail", WORKAROUND_OE6_FETCH_NO_NEWMAIL },
+	{ "delay-newmail", WORKAROUND_DELAY_NEWMAIL },
 	{ "outlook-idle", WORKAROUND_OUTLOOK_IDLE },
 	{ "netscape-eoh", WORKAROUND_NETSCAPE_EOH },
 	{ "tb-negative-fetch", WORKAROUND_TB_NEGATIVE_FETCH },