dovecot-2.1-pigeonhole: lib-sieve: fixed bug in message snapshots.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.1-pigeonhole/rev/d17f4a699ad2
changeset: 1588:d17f4a699ad2
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Tue Dec 27 22:21:34 2011 +0100
description:
lib-sieve: fixed bug in message snapshots.
Message substitutions would not always cause a proper snapshot.

diffstat:

 src/lib-sieve/sieve-message.c |  5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r c58e9eb1010d -r d17f4a699ad2 src/lib-sieve/sieve-message.c
--- a/src/lib-sieve/sieve-message.c	Tue Dec 27 21:29:19 2011 +0100
+++ b/src/lib-sieve/sieve-message.c	Tue Dec 27 22:21:34 2011 +0100
@@ -78,6 +78,7 @@
 	ARRAY_DEFINE(ext_contexts, void *);
 
 	unsigned int edit_snapshot:1;
+	unsigned int substitute_snapshot:1;
 };
 
 /*
@@ -376,7 +377,7 @@
 		return -1;
 	}
 
-	if ( msgctx->edit_snapshot ) {
+	if ( msgctx->substitute_snapshot ) {
 		version = sieve_message_version_new(msgctx);
 	} else {
 		version = sieve_message_version_get(msgctx);	
@@ -392,6 +393,7 @@
 
 	sieve_message_context_flush(msgctx);
 
+	msgctx->substitute_snapshot = FALSE;
 	msgctx->edit_snapshot = FALSE;
 
 	return 1;
@@ -436,6 +438,7 @@
 (struct sieve_message_context *msgctx)
 {
 	msgctx->edit_snapshot = TRUE;
+	msgctx->substitute_snapshot = TRUE;
 }
 
 /*