X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=query.cc;h=2fe3965f64549f3beb1fe42b6f585f492c82a09d;hp=4df2f52ff65ce8b39294828eb47c2dd0159320af;hb=c771eaf362edb021888d114989d38d8fb2b4cfb3;hpb=1726c5c814aecd924849a0b91c82d420af945827

diff --git a/query.cc b/query.cc
index 4df2f52f..2fe3965f 100644
--- a/query.cc
+++ b/query.cc
@@ -39,7 +39,7 @@ struct _notmuch_message_results {
 
 struct _notmuch_thread_results {
     notmuch_database_t *notmuch;
-    GPtrArray *thread_ids;
+    GPtrArray *threads;
     unsigned int index;
 };
 
@@ -165,7 +165,7 @@ notmuch_query_search_messages (notmuch_query_t *query)
 static int
 _notmuch_thread_results_destructor (notmuch_thread_results_t *results)
 {
-    g_ptr_array_free (results->thread_ids, TRUE);
+    g_ptr_array_free (results->threads, TRUE);
 
     return 0;
 }
@@ -174,9 +174,10 @@ notmuch_thread_results_t *
 notmuch_query_search_threads (notmuch_query_t *query)
 {
     notmuch_thread_results_t *thread_results;
+    notmuch_thread_t *thread;
+    const char *thread_id;
     notmuch_message_results_t *message_results;
     notmuch_message_t *message;
-    const char *thread_id;
     GHashTable *seen;
 
     thread_results = talloc (query, notmuch_thread_results_t);
@@ -184,7 +185,7 @@ notmuch_query_search_threads (notmuch_query_t *query)
 	return NULL;
 
     thread_results->notmuch = query->notmuch;
-    thread_results->thread_ids = g_ptr_array_new ();
+    thread_results->threads = g_ptr_array_new ();
     thread_results->index = 0;
 
     talloc_set_destructor (thread_results, _notmuch_thread_results_destructor);
@@ -197,18 +198,24 @@ notmuch_query_search_threads (notmuch_query_t *query)
 	 notmuch_message_results_advance (message_results))
     {
 	message = notmuch_message_results_get (message_results);
+
 	thread_id = notmuch_message_get_thread_id (message);
 
-	if (g_hash_table_lookup_extended (seen,
-					  thread_id, NULL, NULL))
+	if (! g_hash_table_lookup_extended (seen,
+					    thread_id, NULL,
+					    (void **) &thread))
 	{
-	    continue;
+	    thread = _notmuch_thread_create (query, query->notmuch,
+					     thread_id);
+
+	    g_hash_table_insert (seen, xstrdup (thread_id), thread);
+
+	    g_ptr_array_add (thread_results->threads, thread);
 	}
 
-	g_hash_table_insert (seen, xstrdup (thread_id), NULL);
+	_notmuch_thread_add_message (thread, message);
 
-	g_ptr_array_add (thread_results->thread_ids,
-			 talloc_strdup (thread_results, thread_id));
+	notmuch_message_destroy (message);
     }
 
     g_hash_table_unref (seen);
@@ -268,26 +275,17 @@ notmuch_message_results_destroy (notmuch_message_results_t *results)
 notmuch_bool_t
 notmuch_thread_results_has_more (notmuch_thread_results_t *results)
 {
-    return (results->index < results->thread_ids->len);
+    return (results->index < results->threads->len);
 }
 
 notmuch_thread_t *
 notmuch_thread_results_get (notmuch_thread_results_t *results)
 {
-    notmuch_thread_t *thread;
-    const char *thread_id;
-
     if (! notmuch_thread_results_has_more (results))
 	return NULL;
 
-    thread_id = (const char *) g_ptr_array_index (results->thread_ids,
-						  results->index);
-
-    thread = _notmuch_thread_create (results,
-				     results->notmuch,
-				     thread_id);
-
-    return thread;
+    return (notmuch_thread_t *) g_ptr_array_index (results->threads,
+						   results->index);
 }
 
 void