dovecot: We can't always merge SEARCH_FLAGS.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/b9d674728523
changeset: 6964:b9d674728523
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Dec 08 19:08:41 2007 +0200
description:
We can't always merge SEARCH_FLAGS.

diffstat:

1 file changed, 3 insertions(+), 2 deletions(-)
src/lib-storage/mail-search.c |    5 +++--

diffs (22 lines):

diff -r 5fb86ed98860 -r b9d674728523 src/lib-storage/mail-search.c
--- a/src/lib-storage/mail-search.c	Sat Dec 08 18:34:23 2007 +0200
+++ b/src/lib-storage/mail-search.c	Sat Dec 08 19:08:41 2007 +0200
@@ -214,7 +214,7 @@ mail_search_args_simplify_sub(struct mai
 		}
 
 		/* merge all flags arguments */
-		if (args->type == SEARCH_FLAGS && !args->not) {
+		if (args->type == SEARCH_FLAGS && !args->not && parent_and) {
 			if (prev_flags_arg == NULL)
 				prev_flags_arg = args;
 			else {
@@ -224,7 +224,8 @@ mail_search_args_simplify_sub(struct mai
 				args = args->next;
 				continue;
 			}
-		} else if (args->type == SEARCH_FLAGS && args->not) {
+		} else if (args->type == SEARCH_FLAGS && args->not &&
+			   !parent_and) {
 			if (prev_not_flags_arg == NULL)
 				prev_not_flags_arg = args;
 			else {