From: David Bremner <david@tethera.net>
Date: Sun, 27 Sep 2015 15:32:02 +0000 (-0300)
Subject: lib: migrate thread.cc to new query_search API
X-Git-Tag: 0.21_rc0~5
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=378ba492a634db5b841f2454991239a897f830b2

lib: migrate thread.cc to new query_search API

here we rely on thread_id_query being attached to the local talloc
context, so no new cleanup code is needed.
---

diff --git a/lib/thread.cc b/lib/thread.cc
index c8e58c33..0c937d76 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -447,6 +447,7 @@ _notmuch_thread_create (void *ctx,
 
     notmuch_messages_t *messages;
     notmuch_message_t *message;
+    notmuch_status_t status;
 
     seed_message = _notmuch_message_create (local, notmuch, seed_doc_id, NULL);
     if (! seed_message)
@@ -504,9 +505,11 @@ _notmuch_thread_create (void *ctx,
      * oldest or newest subject is desired. */
     notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
-    /* XXX: this should use the _st version, but it needs an error path
-     */
-    for (messages = notmuch_query_search_messages (thread_id_query);
+    status = notmuch_query_search_messages_st (thread_id_query, &messages);
+    if (status)
+	goto DONE;
+
+    for (;
 	 notmuch_messages_valid (messages);
 	 notmuch_messages_move_to_next (messages))
     {