From d24dc9cd66e0336f60526a83f9cadc77d0fe3ad3 Mon Sep 17 00:00:00 2001
From: "bienvenu%nventure.com" <bienvenu%nventure.com>
Date: Wed, 28 Sep 2005 20:39:02 +0000
Subject: [PATCH] make imap filters after the fact run locally instead of on
 imap server, sr=mscott 278052

---
 mailnews/base/search/src/nsMsgFilterService.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/mailnews/base/search/src/nsMsgFilterService.cpp b/mailnews/base/search/src/nsMsgFilterService.cpp
index a7b5ce0a07a5..d5cf838e2020 100644
--- a/mailnews/base/search/src/nsMsgFilterService.cpp
+++ b/mailnews/base/search/src/nsMsgFilterService.cpp
@@ -390,6 +390,8 @@ nsresult nsMsgFilterAfterTheFact::RunNextFilter()
     m_searchSession->UnregisterListener(this);
   m_searchSession = do_CreateInstance(NS_MSGSEARCHSESSION_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
+
+  nsMsgSearchScopeValue searchScope = nsMsgSearchScope::offlineMail;
   PRUint32 termCount;
   searchTerms->Count(&termCount);
   for (PRUint32 termIndex = 0; termIndex < termCount; termIndex++)
@@ -401,13 +403,7 @@ nsresult nsMsgFilterAfterTheFact::RunNextFilter()
     NS_ENSURE_SUCCESS(rv, rv);
   }
   m_searchSession->RegisterListener(this);
-  // get incoming server for folder and get search scope from there.
-  nsCOMPtr <nsIMsgIncomingServer> incomingServer;
-  rv = m_curFolder->GetServer(getter_AddRefs(incomingServer));
-  NS_ENSURE_SUCCESS(rv, rv);
-  nsMsgSearchScopeValue searchScope;
 
-  incomingServer->GetSearchScope(&searchScope);
   rv = m_searchSession->AddScopeTerm(searchScope, m_curFolder);
   NS_ENSURE_SUCCESS(rv, rv);
   // it's possible that this error handling will need to be rearranged when mscott lands the UI for
@@ -752,7 +748,7 @@ nsresult nsMsgFilterAfterTheFact::ApplyFilter()
               m_searchHitHdrs->QueryElementAt(msgIndex, NS_GET_IID(nsIMsgDBHdr), getter_AddRefs(msgHdr));
               if (msgHdr)
               {
-	        PRUint32 flags = 0;
+                PRUint32 flags = 0;
                 msgHdr->GetFlags(&flags);
                 if (flags & MSG_FLAG_PARTIAL)
                 {