Merge branch 'release'

[notmuch] / lib / thread-fp.cc

diff --git a/lib/thread-fp.cc b/lib/thread-fp.cc
index 75339ffa79210ebca5192547e16bbcea6179faf8..06708ef291852f8ab5e1888c7e5755c18921f288 100644 (file)
--- a/lib/thread-fp.cc
+++ b/lib/thread-fp.cc
@@ -24,8 +24,6 @@
 #include "thread-fp.h"
 #include <iostream>
 
-#if HAVE_XAPIAN_FIELD_PROCESSOR
-
 Xapian::Query
 ThreadFieldProcessor::operator() (const std::string & str)
 {
@@ -42,17 +40,19 @@ ThreadFieldProcessor::operator() (const std::string & str)
            std::set<std::string> terms;
 
            if (! subquery)
-               throw Xapian::QueryParserError ("failed to create subquery for '" + subquery_str + "'");
+               throw Xapian::QueryParserError ("failed to create subquery for '" + subquery_str +
+                                               "'");
 
            status = notmuch_query_search_messages (subquery, &messages);
            if (status)
-               throw Xapian::QueryParserError ("failed to search messages for '" + subquery_str + "'");
+               throw Xapian::QueryParserError ("failed to search messages for '" + subquery_str +
+                                               "'");
 
            for (; notmuch_messages_valid (messages); notmuch_messages_move_to_next (messages)) {
                std::string term = thread_prefix;
                notmuch_message_t *message;
                message = notmuch_messages_get (messages);
-               term += notmuch_message_get_thread_id (message);
+               term += _notmuch_message_get_thread_id_only (message);
                terms.insert (term);
            }
            return Xapian::Query (Xapian::Query::OP_OR, terms.begin (), terms.end ());
@@ -64,4 +64,3 @@ ThreadFieldProcessor::operator() (const std::string & str)
     }
 
 }
-#endif