# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1042311716 -7200
# Node ID 5c8cd0bf94c1517d2280931373cad6922bb2fe83
# Parent  6f1e87a518720707c9e720a454f3c90b7fade4e7
We support only REFERENCES threading for now - updated capability and trying
to use ORDEREDSUBJECT now gives error.

diff -r 6f1e87a51872 -r 5c8cd0bf94c1 configure.in
--- a/configure.in	Sat Jan 11 20:55:01 2003 +0200
+++ b/configure.in	Sat Jan 11 21:01:56 2003 +0200
@@ -1,7 +1,7 @@
 AC_INIT(src)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dovecot, 0.99.5)
+AM_INIT_AUTOMAKE(dovecot, 0.99.6rc3)
 
 AM_MAINTAINER_MODE
 
@@ -786,7 +786,7 @@
 dnl ** capabilities
 dnl **
 
-capability="IMAP4rev1 SORT"
+capability="IMAP4rev1 SORT THREAD=REFERENCES"
 AC_DEFINE_UNQUOTED(CAPABILITY_STRING, "$capability", IMAP capabilities)
 
 dnl **
diff -r 6f1e87a51872 -r 5c8cd0bf94c1 src/imap/cmd-thread.c
--- a/src/imap/cmd-thread.c	Sat Jan 11 20:55:01 2003 +0200
+++ b/src/imap/cmd-thread.c	Sat Jan 11 21:01:56 2003 +0200
@@ -35,11 +35,13 @@
 	}
 
 	str = IMAP_ARG_STR(args);
-	if (strcasecmp(str, "ORDEREDSUBJECT") == 0)
-		threading = MAIL_THREAD_ORDEREDSUBJECT;
-	else if (strcasecmp(str, "REFERENCES") == 0)
+	if (strcasecmp(str, "REFERENCES") == 0)
 		threading = MAIL_THREAD_REFERENCES;
-	else {
+	else if (strcasecmp(str, "ORDEREDSUBJECT") == 0) {
+		client_send_command_error(client,
+			"ORDEREDSUBJECT threading is currently not supported.");
+		return TRUE;
+	} else {
 		client_send_command_error(client, "Unknown thread algorithm.");
 		return TRUE;
 	}
diff -r 6f1e87a51872 -r 5c8cd0bf94c1 src/lib-storage/mail-thread.c
--- a/src/lib-storage/mail-thread.c	Sat Jan 11 20:55:01 2003 +0200
+++ b/src/lib-storage/mail-thread.c	Sat Jan 11 21:01:56 2003 +0200
@@ -89,6 +89,9 @@
 	struct mail_thread_context *ctx;
 	pool_t pool;
 
+	if (type != MAIL_THREAD_REFERENCES)
+		i_fatal("Only REFERENCES threading supported");
+
 	pool = pool_alloconly_create("mail_thread_context",
 				     sizeof(struct node) * APPROX_MSG_COUNT);