Revert "thread: Fix sort of search when constructing threads."

[notmuch] / lib / thread.cc

diff --git a/lib/thread.cc b/lib/thread.cc
index e514bf827ec58be95e2d5d0aa308268204cd230e..9b37143d33a4b14aabd62ed20c13183d506ba714 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -123,7 +123,8 @@ _thread_add_message (notmuch_thread_t *thread,
 
 static void
 _thread_add_matched_message (notmuch_thread_t *thread,
-                            notmuch_message_t *message)
+                            notmuch_message_t *message,
+                            notmuch_sort_t sort)
 {
     time_t date;
     notmuch_message_t *hashed_message;
@@ -298,7 +299,7 @@ _notmuch_thread_create (void *ctx,
     thread->oldest = 0;
     thread->newest = 0;
 
-    notmuch_query_set_sort (thread_id_query, sort);
+    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
     for (messages = notmuch_query_search_messages (thread_id_query);
         notmuch_messages_valid (messages);
@@ -309,7 +310,7 @@ _notmuch_thread_create (void *ctx,
        _thread_add_message (thread, message);
 
        if (! matched_is_subset_of_thread)
-           _thread_add_matched_message (thread, message);
+           _thread_add_matched_message (thread, message, sort);
 
        _notmuch_message_close (message);
     }
@@ -331,14 +332,12 @@ _notmuch_thread_create (void *ctx,
        if (unlikely (matched_query == NULL))
            return NULL;
 
-       notmuch_query_set_sort (matched_query, sort);
-
        for (messages = notmuch_query_search_messages (matched_query);
             notmuch_messages_valid (messages);
             notmuch_messages_move_to_next (messages))
        {
            message = notmuch_messages_get (messages);
-           _thread_add_matched_message (thread, message);
+           _thread_add_matched_message (thread, message, sort);
            _notmuch_message_close (message);
        }