Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6964:b9d674728523 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
We can't always merge SEARCH_FLAGS.
author Timo Sirainen <tss@iki.fi>
date Sat, 08 Dec 2007 19:08:41 +0200
parents 5fb86ed98860
children ae369569e7de
files src/lib-storage/mail-search.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 @@
 		}
 
 		/* 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 @@
 				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 {