debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 04:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "thread: Simplify code for assigning the subject."

Browse source 
This reverts commit 36e4459a32.

With the two previous reverts, this fixes the recent message-sorting
regression, so the test suite now passes again.
This commit is contained in:
Carl Worth 2010-04-22 14:00:44 -07:00
parent a109966080
commit 21965718a5
1 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/thread.cc
View file

@ -112,6 +112,12 @@ _thread_add_message (notmuch_thread_t *thread,
g_object_unref (G_OBJECT (list)); 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); for (tags = notmuch_message_get_tags (message);
notmuch_tags_valid (tags); notmuch_tags_valid (tags);
notmuch_tags_move_to_next (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) if (date > thread->newest || ! thread->matched_messages)
thread->newest = date; 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) || if ((strncasecmp (subject, "Re: ", 4) == 0) ||
(strncasecmp (subject, "Aw: ", 4) == 0) || (strncasecmp (subject, "Aw: ", 4) == 0) ||
(strncasecmp (subject, "Vs: ", 4) == 0) || (strncasecmp (subject, "Vs: ", 4) == 0) ||
(strncasecmp (subject, "Sv: ", 4) == 0)) (strncasecmp (subject, "Sv: ", 4) == 0)) {
{
thread->subject = talloc_strdup (thread, subject + 4); cleaned_subject = talloc_strndup (thread,
} subject + 4,
else strlen(subject) - 4);
{ } else {
thread->subject = talloc_strdup (thread, subject); 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++; thread->matched_messages++;