[dovecot-cvs] dovecot/src/lib-index mail-transaction-log-view.c, 1.33, 1.34

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-index
In directory talvi:/tmp/cvs-serv29984

Modified Files:
	mail-transaction-log-view.c 
Log Message:
When view was synced without expunges, we didn't actually sync the expunges
later anymore.



Index: mail-transaction-log-view.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-index/mail-transaction-log-view.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- mail-transaction-log-view.c	25 Oct 2004 17:42:51 -0000	1.33
+++ mail-transaction-log-view.c	13 Nov 2004 22:27:57 -0000	1.34
@@ -378,8 +378,13 @@
 		return -1;
 
 	while ((ret = log_view_get_next(view, &hdr, &data)) > 0) {
-		if ((view->type_mask & hdr->type) != 0)
-			break;
+		if ((view->type_mask & hdr->type) != 0) {
+			/* looks like this is within our mask, but expunge
+			   protection may mess up the check. */
+			if ((hdr->type & MAIL_TRANSACTION_EXPUNGE) == 0 ||
+			    (view->type_mask & MAIL_TRANSACTION_EXPUNGE) != 0)
+				break;
+		}
 
 		/* we don't want this record */
 		if (skipped_r != NULL)