+ thread->matched_messages++;
+}
+
+/* Create a new notmuch_thread_t object for the given thread ID,
+ * treating any messages matching 'query_string' as "matched".
+ *
+ * Creating the thread will trigger two database searches. The first
+ * is for all messages belonging to the thread, (to get the first
+ * subject line, the total count of messages, and all authors). The
+ * second search is for all messages that are in the thread and that
+ * also match the given query_string. This is to allow for a separate
+ * count of matched messages, and to allow a viewer to diplay these
+ * messages differently.
+ *
+ * Here, 'ctx' is talloc context for the resulting thread object.
+ *
+ * This function returns NULL in the case of any error.
+ */
+notmuch_thread_t *
+_notmuch_thread_create (void *ctx,
+ notmuch_database_t *notmuch,
+ const char *thread_id,
+ const char *query_string)
+{
+ notmuch_thread_t *thread;
+ const char *thread_id_query_string, *matched_query_string;
+ notmuch_query_t *thread_id_query, *matched_query;
+ notmuch_messages_t *messages;
+
+ thread_id_query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
+ if (unlikely (query_string == NULL))
+ return NULL;
+
+ matched_query_string = talloc_asprintf (ctx, "%s AND (%s)",
+ thread_id_query_string,
+ query_string);
+ if (unlikely (matched_query_string == NULL))
+ return NULL;
+
+ thread_id_query = notmuch_query_create (notmuch, thread_id_query_string);
+ if (unlikely (thread_id_query == NULL))
+ return NULL;
+
+ matched_query = notmuch_query_create (notmuch, matched_query_string);
+ if (unlikely (thread_id_query == NULL))
+ return NULL;
+
+ thread = talloc (ctx, notmuch_thread_t);
+ if (unlikely (thread == NULL))
+ return NULL;
+
+ talloc_set_destructor (thread, _notmuch_thread_destructor);
+
+ thread->notmuch = notmuch;
+ thread->thread_id = talloc_strdup (thread, thread_id);
+ thread->subject = NULL;
+ thread->authors_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
+ free, NULL);
+ thread->authors = NULL;
+ thread->tags = g_hash_table_new_full (g_str_hash, g_str_equal,
+ free, NULL);
+
+ thread->total_messages = 0;
+ thread->matched_messages = 0;
+ thread->oldest = 0;
+ thread->newest = 0;
+
+ notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_DATE);
+
+ for (messages = notmuch_query_search_messages (thread_id_query, 0, -1);
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
+ {
+ _thread_add_message (thread, notmuch_messages_get (messages));
+ }
+
+ notmuch_query_destroy (thread_id_query);
+
+ for (messages = notmuch_query_search_messages (matched_query, 0, -1);
+ notmuch_messages_has_more (messages);
+ notmuch_messages_advance (messages))
+ {
+ _thread_add_matched_message (thread, notmuch_messages_get (messages));
+ }
+
+ notmuch_query_destroy (matched_query);
+
+ return thread;
+}
+
+const char *
+notmuch_thread_get_thread_id (notmuch_thread_t *thread)
+{
+ return thread->thread_id;
+}
+
+int
+notmuch_thread_get_total_messages (notmuch_thread_t *thread)
+{
+ return thread->total_messages;
+}
+
+int
+notmuch_thread_get_matched_messages (notmuch_thread_t *thread)
+{
+ return thread->matched_messages;