X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fquery.cc;h=7c1df90c39cce262246b1930f913f90e57a34f46;hb=f7b49d658ad507b72d01b06d56975dba0b7cafc8;hp=2169709c7ddcb57980691287670e9cb038c7d151;hpb=523f1ce0a5e1cbe62dc9b879f224d6b60631322f;p=notmuch

diff --git a/lib/query.cc b/lib/query.cc
index 2169709c..7c1df90c 100644
--- a/lib/query.cc
+++ b/lib/query.cc
@@ -61,7 +61,7 @@ notmuch_query_create (notmuch_database_t *notmuch,
 
     query->query_string = talloc_strdup (query, query_string);
 
-    query->sort = NOTMUCH_SORT_DATE_OLDEST_FIRST;
+    query->sort = NOTMUCH_SORT_DATE;
 
     return query;
 }
@@ -123,10 +123,10 @@ notmuch_query_search_messages (notmuch_query_t *query,
 	}
 
 	switch (query->sort) {
-	case NOTMUCH_SORT_DATE_OLDEST_FIRST:
+	case NOTMUCH_SORT_DATE:
 	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, FALSE);
 	    break;
-	case NOTMUCH_SORT_DATE_NEWEST_FIRST:
+	case NOTMUCH_SORT_DATE_REVERSE:
 	    enquire.set_sort_by_value (NOTMUCH_VALUE_TIMESTAMP, TRUE);
 	    break;
 	case NOTMUCH_SORT_MESSAGE_ID:
@@ -218,9 +218,10 @@ notmuch_query_search_threads (notmuch_query_t *query,
 						thread_id, NULL,
 						(void **) &thread))
 	    {
-		if (threads_seen > first) {
+		if (threads_seen >= first) {
 		    thread = _notmuch_thread_create (query, query->notmuch,
-						     thread_id);
+						     thread_id,
+						     query->query_string);
 		    g_ptr_array_add (threads->threads, thread);
 		} else {
 		    thread = NULL;
@@ -231,12 +232,12 @@ notmuch_query_search_threads (notmuch_query_t *query,
 		threads_seen++;
 	    }
 
-	    if (thread)
-		_notmuch_thread_add_message (thread, message);
-
 	    notmuch_message_destroy (message);
 
 	    messages_seen++;
+
+	    if (max_threads >= 0 && threads_seen >= first + max_threads)
+		break;
 	}
 
 	/* Stop if we're not seeing any more messages. */