Merge branch 'release'

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 9cf8062cbe7caa2c5f7ecd714ca934c7f96b1e76..02444e09e965c4ce0dbc396d5ed48b5abce5ba0a 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -21,7 +21,6 @@
 #include "database-private.h"
 #include "parse-time-vrp.h"
 #include "query-fp.h"
-#include "thread-fp.h"
 #include "regexp-fields.h"
 #include "string-util.h"
 
@@ -259,8 +258,7 @@ prefix_t prefix_table[] = {
     { "directory",             "XDIRECTORY",   NOTMUCH_FIELD_NO_FLAGS },
     { "file-direntry",         "XFDIRENTRY",   NOTMUCH_FIELD_NO_FLAGS },
     { "directory-direntry",    "XDDIRENTRY",   NOTMUCH_FIELD_NO_FLAGS },
-    { "thread",                        "G",            NOTMUCH_FIELD_EXTERNAL |
-                                               NOTMUCH_FIELD_PROCESSOR },
+    { "thread",                        "G",            NOTMUCH_FIELD_EXTERNAL },
     { "tag",                   "K",            NOTMUCH_FIELD_EXTERNAL |
                                                NOTMUCH_FIELD_PROCESSOR },
     { "is",                    "K",            NOTMUCH_FIELD_EXTERNAL |
@@ -319,8 +317,6 @@ _setup_query_field (const prefix_t *prefix, notmuch_database_t *notmuch)
            fp = (new DateFieldProcessor())->release ();
        else if (STRNCMP_LITERAL(prefix->name, "query") == 0)
            fp = (new QueryFieldProcessor (*notmuch->query_parser, notmuch))->release ();
-       else if (STRNCMP_LITERAL(prefix->name, "thread") == 0)
-           fp = (new ThreadFieldProcessor (*notmuch->query_parser, notmuch))->release ();
        else
            fp = (new RegexpFieldProcessor (prefix->name, prefix->flags,
                                            *notmuch->query_parser, notmuch))->release ();