added search filtering

[notmuch] / lib / thread.cc

diff --git a/lib/thread.cc b/lib/thread.cc
index 4411d64d98da05964318b23c0d26cc9dba7e77af..58d88c2d1597145276a83807165d6939ab340bd2 100644 (file)
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -155,7 +155,7 @@ _resolve_thread_relationships (unused (notmuch_thread_t *thread))
     while ((node = *prev)) {
        message = node->message;
        in_reply_to = _notmuch_message_get_in_reply_to (message);
-       if (in_reply_to &&
+       if (in_reply_to && strlen (in_reply_to) &&
            g_hash_table_lookup_extended (thread->message_hash,
                                          in_reply_to, NULL,
                                          (void **) &parent))
@@ -190,7 +190,7 @@ _resolve_thread_relationships (unused (notmuch_thread_t *thread))
  * 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
+ * count of matched messages, and to allow a viewer to display these
  * messages differently.
  *
  * Here, 'ctx' is talloc context for the resulting thread object.
@@ -207,6 +207,7 @@ _notmuch_thread_create (void *ctx,
     const char *thread_id_query_string, *matched_query_string;
     notmuch_query_t *thread_id_query, *matched_query;
     notmuch_messages_t *messages;
+    notmuch_message_t *message;
 
     thread_id_query_string = talloc_asprintf (ctx, "thread:%s", thread_id);
     if (unlikely (query_string == NULL))
@@ -257,22 +258,26 @@ _notmuch_thread_create (void *ctx,
     thread->oldest = 0;
     thread->newest = 0;
 
-    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_DATE);
+    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
-    for (messages = notmuch_query_search_messages (thread_id_query, 0, -1);
+    for (messages = notmuch_query_search_messages (thread_id_query);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {
-       _thread_add_message (thread, notmuch_messages_get (messages));
+       message = notmuch_messages_get (messages);
+       _thread_add_message (thread, message);
+       _notmuch_message_close (message);
     }
 
     notmuch_query_destroy (thread_id_query);
 
-    for (messages = notmuch_query_search_messages (matched_query, 0, -1);
+    for (messages = notmuch_query_search_messages (matched_query);
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {
-       _thread_add_matched_message (thread, notmuch_messages_get (messages));
+       message = notmuch_messages_get (messages);
+       _thread_add_matched_message (thread, message);
+       _notmuch_message_close (message);
     }
 
     notmuch_query_destroy (matched_query);