# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1238716378 14400
# Node ID 20e6fa42d081b09b1f27153fb27122c45f322f22
# Parent  5ce33cfc568fac7bd305809090ee60ea54190114
Renamed THREAD X-REFERENCES2 to THREAD REFS (from INTHREAD draft).

diff -r 5ce33cfc568f -r 20e6fa42d081 configure.in
--- a/configure.in	Thu Apr 02 19:31:52 2009 -0400
+++ b/configure.in	Thu Apr 02 19:52:58 2009 -0400
@@ -2356,7 +2356,7 @@
 dnl **
 
 capability_banner="IMAP4rev1 LITERAL+ SASL-IR LOGIN-REFERRALS ID ENABLE"
-capability="$capability_banner SORT THREAD=REFERENCES MULTIAPPEND UNSELECT IDLE CHILDREN NAMESPACE UIDPLUS LIST-EXTENDED I18NLEVEL=1 CONDSTORE QRESYNC ESEARCH ESORT SEARCHRES WITHIN CONTEXT=SEARCH"
+capability="$capability_banner SORT THREAD=REFERENCES THREAD=REFS MULTIAPPEND UNSELECT IDLE CHILDREN NAMESPACE UIDPLUS LIST-EXTENDED I18NLEVEL=1 CONDSTORE QRESYNC ESEARCH ESORT SEARCHRES WITHIN CONTEXT=SEARCH"
 AC_DEFINE_UNQUOTED(CAPABILITY_STRING, "$capability", IMAP capabilities)
 AC_DEFINE_UNQUOTED(CAPABILITY_BANNER_STRING, "$capability_banner", IMAP capabilities advertised in banner) 
 
diff -r 5ce33cfc568f -r 20e6fa42d081 src/imap/cmd-thread.c
--- a/src/imap/cmd-thread.c	Thu Apr 02 19:31:52 2009 -0400
+++ b/src/imap/cmd-thread.c	Thu Apr 02 19:52:58 2009 -0400
@@ -83,7 +83,7 @@
 	int ret;
 
 	i_assert(thread_type == MAIL_THREAD_REFERENCES ||
-		 thread_type == MAIL_THREAD_REFERENCES2);
+		 thread_type == MAIL_THREAD_REFS);
 
 	str = str_new(default_pool, 1024);
 	ret = mail_thread_init(cmd->client->mailbox,
diff -r 5ce33cfc568f -r 20e6fa42d081 src/lib-storage/index/index-thread-finish.c
--- a/src/lib-storage/index/index-thread-finish.c	Thu Apr 02 19:31:52 2009 -0400
+++ b/src/lib-storage/index/index-thread-finish.c	Thu Apr 02 19:52:58 2009 -0400
@@ -543,7 +543,7 @@
 			sort_root_nodes(ctx);
 		}
 		break;
-	case MAIL_THREAD_REFERENCES2:
+	case MAIL_THREAD_REFS:
 		sort_root_nodes_ref2(ctx, record_count);
 		break;
 	default:
diff -r 5ce33cfc568f -r 20e6fa42d081 src/lib-storage/index/index-thread.c
--- a/src/lib-storage/index/index-thread.c	Thu Apr 02 19:31:52 2009 -0400
+++ b/src/lib-storage/index/index-thread.c	Thu Apr 02 19:52:58 2009 -0400
@@ -57,8 +57,8 @@
 {
 	if (strcasecmp(str, "REFERENCES") == 0)
 		*type_r = MAIL_THREAD_REFERENCES;
-	else if (strcasecmp(str, "X-REFERENCES2") == 0)
-		*type_r = MAIL_THREAD_REFERENCES2;
+	else if (strcasecmp(str, "REFS") == 0)
+		*type_r = MAIL_THREAD_REFS;
 	else
 		return FALSE;
 	return TRUE;
diff -r 5ce33cfc568f -r 20e6fa42d081 src/lib-storage/mail-thread.h
--- a/src/lib-storage/mail-thread.h	Thu Apr 02 19:31:52 2009 -0400
+++ b/src/lib-storage/mail-thread.h	Thu Apr 02 19:52:58 2009 -0400
@@ -9,7 +9,7 @@
 	MAIL_THREAD_NONE,
 	MAIL_THREAD_ORDEREDSUBJECT,
 	MAIL_THREAD_REFERENCES,
-	MAIL_THREAD_REFERENCES2
+	MAIL_THREAD_REFS
 };
 
 struct mail_thread_child_node {