[dovecot-cvs] dovecot/src/imap cmd-fetch.c,1.14,1.15 cmd-search.c,1.14,1.15 cmd-store.c,1.11,1.12

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/imap
In directory danu:/tmp/cvs-serv6010

Modified Files:
	cmd-fetch.c cmd-search.c cmd-store.c 
Log Message:
Sync EXPUNGEs also with UID FETCH and UID STORE.



Index: cmd-fetch.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/cmd-fetch.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cmd-fetch.c	11 Feb 2003 10:30:29 -0000	1.14
+++ cmd-fetch.c	21 Feb 2003 18:13:14 -0000	1.15
@@ -351,8 +351,13 @@
 	ret = imap_fetch(client, fetch_data, imap_data,
 			 bodies, messageset, client->cmd_uid);
 	if (ret >= 0) {
-		if ((client_workarounds & WORKAROUND_OE6_FETCH_NO_NEWMAIL) == 0)
-			client_sync_without_expunges(client);
+		if ((client_workarounds &
+		     WORKAROUND_OE6_FETCH_NO_NEWMAIL) == 0) {
+			if (client->cmd_uid)
+				client_sync_full(client);
+			else
+				client_sync_without_expunges(client);
+		}
 
 		client_send_tagline(client, ret > 0 ? "OK Fetch completed." :
 			"NO Some of the requested messages no longer exist.");

Index: cmd-search.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/cmd-search.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cmd-search.c	20 Jan 2003 14:52:51 -0000	1.14
+++ cmd-search.c	21 Feb 2003 18:13:14 -0000	1.15
@@ -91,7 +91,6 @@
 		/* error in search arguments */
 		client_send_tagline(client, t_strconcat("NO ", error, NULL));
 	} else if (imap_search(client, charset, sargs)) {
-		/* NOTE: syncing is allowed when returning UIDs */
 		if (client->cmd_uid)
 			client_sync_full(client);
 		else

Index: cmd-store.c
===================================================================
RCS file: /home/cvs/dovecot/src/imap/cmd-store.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cmd-store.c	14 Feb 2003 08:00:52 -0000	1.11
+++ cmd-store.c	21 Feb 2003 18:13:14 -0000	1.12
@@ -74,8 +74,10 @@
 	if (client->mailbox->update_flags(client->mailbox, messageset,
 					  client->cmd_uid, &flags,
 					  modify_type, !silent, &all_found)) {
-		/* NOTE: syncing isn't allowed here */
-		client_sync_without_expunges(client);
+		if (client->cmd_uid)
+			client_sync_full(client);
+		else
+			client_sync_without_expunges(client);
 		client_send_tagline(client, all_found ? "OK Store completed." :
 				    "NO Some of the messages no longer exist.");
 	} else {