From 0eb31a080a8020c3f820bfd57c843daaa3ea4c31 Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Tue, 17 Jul 2007 00:58:03 +0000 Subject: [PATCH] fix 388055 imap filters on non-default headers fail, sr=mscott git-svn-id: svn://10.0.0.236/trunk@230085 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/search/src/nsMsgFilter.cpp | 3 +-- mozilla/mailnews/base/search/src/nsMsgFilterList.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp index 6fb124567f8..133d4c1a734 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp @@ -406,8 +406,7 @@ NS_IMETHODIMP nsMsgFilter::GetTerm(PRInt32 termIndex, term->GetValue(value); if(booleanAnd) term->GetBooleanAnd(booleanAnd); - if (attrib && !arbitraryHeader.IsEmpty() - && *attrib > nsMsgSearchAttrib::OtherHeader + if (attrib && *attrib > nsMsgSearchAttrib::OtherHeader && *attrib < nsMsgSearchAttrib::kNumMsgSearchAttributes) term->GetArbitraryHeader(arbitraryHeader); } diff --git a/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp b/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp index 6bc1ad8e650..43a1a5b113c 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp @@ -1171,7 +1171,7 @@ nsresult nsMsgFilterList::ComputeArbitraryHeaders() { if (m_arbitraryHeaders.IsEmpty()) m_arbitraryHeaders.Assign(arbitraryHeader); - else if (PL_strncasecmp(m_arbitraryHeaders.get(), arbitraryHeader.get(), arbitraryHeader.Length())) + else if (m_arbitraryHeaders.Find(arbitraryHeader, PR_TRUE) == kNotFound) { m_arbitraryHeaders.Append(" "); m_arbitraryHeaders.Append(arbitraryHeader);