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))
}
}
+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 ((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,
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,
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