dovecot-1.2: Renamed THREAD X-REFERENCES2 to THREAD REFS (from I...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/20e6fa42d081
changeset: 8903:20e6fa42d081
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Apr 02 19:52:58 2009 -0400
description:
Renamed THREAD X-REFERENCES2 to THREAD REFS (from INTHREAD draft).

diffstat:

5 files changed, 6 insertions(+), 6 deletions(-)
configure.in                                |    2 +-
src/imap/cmd-thread.c                       |    2 +-
src/lib-storage/index/index-thread-finish.c |    2 +-
src/lib-storage/index/index-thread.c        |    4 ++--
src/lib-storage/mail-thread.h               |    2 +-

diffs (62 lines):

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 **
 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 @@ static int imap_thread(struct client_com
 	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 @@ static void mail_thread_finish(struct th
 			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 @@ bool mail_thread_type_parse(const char *
 {
 	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 @@ enum mail_thread_type {
 	MAIL_THREAD_NONE,
 	MAIL_THREAD_ORDEREDSUBJECT,
 	MAIL_THREAD_REFERENCES,
-	MAIL_THREAD_REFERENCES2
+	MAIL_THREAD_REFS
 };
 
 struct mail_thread_child_node {