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

diff --git a/lib/thread.cc b/lib/thread.cc
index e514bf82..e1da060e 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -84,7 +84,7 @@ _thread_add_message (notmuch_thread_t *thread,
 {
     notmuch_tags_t *tags;
     const char *tag;
-    InternetAddressList *list;
+    InternetAddressList *list = NULL;
     InternetAddress *address;
     const char *from, *author;
 
@@ -97,7 +97,9 @@ _thread_add_message (notmuch_thread_t *thread,
 			 message);
 
     from = notmuch_message_get_header (message, "from");
-    list = internet_address_list_parse_string (from);
+    if (from)
+	list = internet_address_list_parse_string (from);
+
     if (list) {
 	address = internet_address_list_get_address (list, 0);
 	if (address) {
@@ -112,6 +114,12 @@ _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 ? subject : "");
+    }
+
     for (tags = notmuch_message_get_tags (message);
 	 notmuch_tags_valid (tags);
 	 notmuch_tags_move_to_next (tags))
@@ -121,9 +129,39 @@ _thread_add_message (notmuch_thread_t *thread,
     }
 }
 
+static void
+_thread_set_subject_from_message (notmuch_thread_t *thread,
+				  notmuch_message_t *message)
+{
+    const char *subject;
+    const char *cleaned_subject;
+
+    subject = notmuch_message_get_header (message, "subject");
+    if (! subject)
+	return;
+
+    if ((strncasecmp (subject, "Re: ", 4) == 0) ||
+	(strncasecmp (subject, "Aw: ", 4) == 0) ||
+	(strncasecmp (subject, "Vs: ", 4) == 0) ||
+	(strncasecmp (subject, "Sv: ", 4) == 0)) {
+
+	cleaned_subject = talloc_strndup (thread,
+					  subject + 4,
+					  strlen(subject) - 4);
+    } else {
+	cleaned_subject = talloc_strdup (thread, subject);
+    }
+
+    if (thread->subject)
+	talloc_free (thread->subject);
+
+    thread->subject = talloc_strdup (thread, cleaned_subject);
+}
+
 static void
 _thread_add_matched_message (notmuch_thread_t *thread,
-			     notmuch_message_t *message)
+			     notmuch_message_t *message,
+			     notmuch_sort_t sort)
 {
     time_t date;
     notmuch_message_t *hashed_message;
@@ -136,24 +174,6 @@ _thread_add_matched_message (notmuch_thread_t *thread,
     if (date > thread->newest || ! thread->matched_messages)
 	thread->newest = date;
 
-    if (! thread->subject) {
-	const char *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))
-	{
-	    thread->subject = talloc_strdup (thread, subject + 4);
-	}
-	else
-	{
-	    thread->subject = talloc_strdup (thread, subject);
-	}
-    }
-
     thread->matched_messages++;
 
     if (g_hash_table_lookup_extended (thread->message_hash,
@@ -162,6 +182,12 @@ _thread_add_matched_message (notmuch_thread_t *thread,
 	notmuch_message_set_flag (hashed_message,
 				  NOTMUCH_MESSAGE_FLAG_MATCH, 1);
     }
+
+    if ((sort == NOTMUCH_SORT_OLDEST_FIRST && date <= thread->newest) ||
+	(sort != NOTMUCH_SORT_OLDEST_FIRST && date == thread->newest))
+    {
+	_thread_set_subject_from_message (thread, message);
+    }
 }
 
 static void
@@ -298,7 +324,7 @@ _notmuch_thread_create (void *ctx,
     thread->oldest = 0;
     thread->newest = 0;
 
-    notmuch_query_set_sort (thread_id_query, sort);
+    notmuch_query_set_sort (thread_id_query, NOTMUCH_SORT_OLDEST_FIRST);
 
     for (messages = notmuch_query_search_messages (thread_id_query);
 	 notmuch_messages_valid (messages);
@@ -309,7 +335,7 @@ _notmuch_thread_create (void *ctx,
 	_thread_add_message (thread, message);
 
 	if (! matched_is_subset_of_thread)
-	    _thread_add_matched_message (thread, message);
+	    _thread_add_matched_message (thread, message, sort);
 
 	_notmuch_message_close (message);
     }
@@ -331,14 +357,12 @@ _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);
+	    _thread_add_matched_message (thread, message, sort);
 	    _notmuch_message_close (message);
 	}