[dovecot-cvs] dovecot/src/lib-imap imap-match.c,1.5,1.6

[cras at procontrol.fi]

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

Modified Files:
	imap-match.c 
Log Message:
Removed list-sort workarounds. It's pretty much needed for maildir listing.
Also added some more complexity and kludging to make everything work
correctly.



Index: imap-match.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-imap/imap-match.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- imap-match.c	19 Feb 2003 19:55:28 -0000	1.5
+++ imap-match.c	20 Feb 2003 16:41:16 -0000	1.6
@@ -135,8 +135,10 @@
 				if (ret > 0)
 					break;
 
-				if (ret == IMAP_MATCH_CHILDREN)
-					best_ret = IMAP_MATCH_CHILDREN;
+				if (ret == IMAP_MATCH_CHILDREN ||
+				    (ret == IMAP_MATCH_PARENT &&
+				     best_ret == IMAP_MATCH_NO))
+					best_ret = ret;
 			}
 
 			if (*data == glob->sep_char)