X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=lib%2Fthread.cc;h=e514bf827ec58be95e2d5d0aa308268204cd230e;hb=8cbb5114a20c1217f23977fd5edca99a0b7a2955;hp=5bf83540d6cf72a9abda4879a06f369f5399b78f;hpb=4971b85641def6b17072ae1b0de0adf15d197f2c;p=notmuch

diff --git a/lib/thread.cc b/lib/thread.cc
index 5bf83540..e514bf82 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -112,12 +112,6 @@ _thread_add_message (notmuch_thread_t *thread,
 	g_object_unref (G_OBJECT (list));
     }
 
-    if (! thread->subject) {
-	const char *subject;
-	subject = notmuch_message_get_header (message, "subject");
-	thread->subject = talloc_strdup (thread, subject);
-    }
-
     for (tags = notmuch_message_get_tags (message);
 	 notmuch_tags_valid (tags);
 	 notmuch_tags_move_to_next (tags))
@@ -129,8 +123,7 @@ _thread_add_message (notmuch_thread_t *thread,
 
 static void
 _thread_add_matched_message (notmuch_thread_t *thread,
-			     notmuch_message_t *message,
-			     notmuch_sort_t sort)
+			     notmuch_message_t *message)
 {
     time_t date;
     notmuch_message_t *hashed_message;
@@ -143,26 +136,22 @@ _thread_add_matched_message (notmuch_thread_t *thread,
     if (date > thread->newest || ! thread->matched_messages)
 	thread->newest = date;
 
-    const char *subject;
-    const char *cleaned_subject;
-
-    subject = notmuch_message_get_header (message, "subject");
-
-    if ((strncasecmp (subject, "Re: ", 4) == 0) ||
-	(strncasecmp (subject, "Aw: ", 4) == 0) ||
-	(strncasecmp (subject, "Vs: ", 4) == 0) ||
-	(strncasecmp (subject, "Sv: ", 4) == 0)) {
+    if (! thread->subject) {
+	const char *subject;
 
-	cleaned_subject = talloc_strndup (thread,
-					  subject + 4,
-					  strlen(subject) - 4);
-    } else {
-	cleaned_subject = talloc_strdup (thread, subject);
-    }
+	subject = notmuch_message_get_header (message, "subject");
 
-    if ((sort == NOTMUCH_SORT_OLDEST_FIRST && date <= thread->newest) ||
-	(sort != NOTMUCH_SORT_OLDEST_FIRST && date == thread->newest)) {
-	thread->subject = talloc_strdup (thread, cleaned_subject);
+	if ((strncasecmp (subject, "Re: ", 4) == 0) ||
+	    (strncasecmp (subject, "Aw: ", 4) == 0) ||
+	    (strncasecmp (subject, "Vs: ", 4) == 0) ||
+	    (strncasecmp (subject, "Sv: ", 4) == 0))
+	{
+	    thread->subject = talloc_strdup (thread, subject + 4);
+	}
+	else
+	{
+	    thread->subject = talloc_strdup (thread, subject);
+	}
     }
 
     thread->matched_messages++;
@@ -309,7 +298,7 @@ _notmuch_thread_create (void *ctx,
     thread->oldest = 0;
     thread->newest = 0;
 
-    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
+    notmuch_query_set_sort (thread_id_query, sort);
 
     for (messages = notmuch_query_search_messages (thread_id_query);
 	 notmuch_messages_valid (messages);
@@ -320,7 +309,7 @@ _notmuch_thread_create (void *ctx,
 	_thread_add_message (thread, message);
 
 	if (! matched_is_subset_of_thread)
-	    _thread_add_matched_message (thread, message, sort);
+	    _thread_add_matched_message (thread, message);
 
 	_notmuch_message_close (message);
     }
@@ -342,12 +331,14 @@ _notmuch_thread_create (void *ctx,
 	if (unlikely (matched_query == NULL))
 	    return NULL;
 
+	notmuch_query_set_sort (matched_query, sort);
+
 	for (messages = notmuch_query_search_messages (matched_query);
 	     notmuch_messages_valid (messages);
 	     notmuch_messages_move_to_next (messages))
 	{
 	    message = notmuch_messages_get (messages);
-	    _thread_add_matched_message (thread, message, sort);
+	    _thread_add_matched_message (thread, message);
 	    _notmuch_message_close (message);
 	}