Renamed THREAD X-REFERENCES2 to THREAD REFS (from INTHREAD draft).

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index 6397bec589b1d65893ee189c118087fcc1ec1e81..5ff56c9d7dccfaa0b1daa997e9bc971c65dcc8b0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2356,7 +2356,7 @@ dnl ** capabilities
 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 --git a/src/imap/cmd-thread.c b/src/imap/cmd-thread.c
index b239250fbc824613df0765381e2f69a9a0174f12..5a12701855b53c59b7bdde4ce3413662b359104f 100644 (file)
--- a/src/imap/cmd-thread.c
+++ b/src/imap/cmd-thread.c
@@ -83,7 +83,7 @@ static int imap_thread(struct client_command_context *cmd,
        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 --git a/src/lib-storage/index/index-thread-finish.c b/src/lib-storage/index/index-thread-finish.c
index e919c2b28e2988f9894d6040f2704834a45760f0..283a4803d284519d2f3e4a8ad54b1e6aca8e77f5 100644 (file)
--- a/src/lib-storage/index/index-thread-finish.c
+++ b/src/lib-storage/index/index-thread-finish.c
@@ -543,7 +543,7 @@ static void mail_thread_finish(struct thread_finish_context *ctx,
                        sort_root_nodes(ctx);
                }
                break;
-       case MAIL_THREAD_REFERENCES2:
+       case MAIL_THREAD_REFS:
                sort_root_nodes_ref2(ctx, record_count);
                break;
        default:

diff --git a/src/lib-storage/index/index-thread.c b/src/lib-storage/index/index-thread.c
index c14aaa4b98a50d5b772c83340e6137c68756b333..92a6c3d3e15bc470d39685226870b8ffdb8f82c6 100644 (file)
--- a/src/lib-storage/index/index-thread.c
+++ b/src/lib-storage/index/index-thread.c
@@ -57,8 +57,8 @@ bool mail_thread_type_parse(const char *str, enum mail_thread_type *type_r)
 {
        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 --git a/src/lib-storage/mail-thread.h b/src/lib-storage/mail-thread.h
index 3ed23a0e8f78064e4408c14997360d194a5babc9..0f79acf26f1373f233236bfd8c9f9febaa032300 100644 (file)
--- a/src/lib-storage/mail-thread.h
+++ b/src/lib-storage/mail-thread.h
@@ -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 {