From 21965718a57613f591464ca260c0f4340c574761 Mon Sep 17 00:00:00 2001
From: Carl Worth <cworth@cworth.org>
Date: Thu, 22 Apr 2010 14:00:44 -0700
Subject: [PATCH] Revert "thread: Simplify code for assigning the subject."
This reverts commit 36e4459a328b8449b3e9d510be81a332a9b35aaa.
With the two previous reverts, this fixes the recent message-sorting
regression, so the test suite now passes again.
---
lib/thread.cc | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
diff --git a/lib/thread.cc b/lib/thread.cc
index 9b37143d..5bf83540 100644
--- a/lib/thread.cc
+++ b/lib/thread.cc
@@ -112,6 +112,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);
+ }
+
for (tags = notmuch_message_get_tags (message);
notmuch_tags_valid (tags);
notmuch_tags_move_to_next (tags))
@@ -137,22 +143,26 @@ _thread_add_matched_message (notmuch_thread_t *thread,
if (date > thread->newest || ! thread->matched_messages)
thread->newest = date;
- if (! thread->subject) {
- const char *subject;
+ const char *subject;
+ const char *cleaned_subject;
- subject = notmuch_message_get_header (message, "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);
- }
+ 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 ((sort == NOTMUCH_SORT_OLDEST_FIRST && date <= thread->newest) ||
+ (sort != NOTMUCH_SORT_OLDEST_FIRST && date == thread->newest)) {
+ thread->subject = talloc_strdup (thread, cleaned_subject);
}
thread->matched_messages++;
--
2.45.2