Bug 377319 Remove #ifdef where previous checkin made them unnecessary r=bienvenu sr=dmose
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Wed, 03 Mar 2010 21:44:08 +0000
changeset 5055 2e7ced2b75da1e351d24ea186a9790dd2602d6fa
parent 5054 450e89a3fdd46257bbaecfa73d91e3472121ba2f
child 5056 713364a0567143804e8e207cceadb91b149d39e9
push idunknown
push userunknown
push dateunknown
reviewersbienvenu, dmose
bugs377319
Bug 377319 Remove #ifdef where previous checkin made them unnecessary r=bienvenu sr=dmose
mailnews/addrbook/src/nsAbCardProperty.cpp
mailnews/addrbook/src/nsAbDirectoryQuery.cpp
mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
mailnews/addrbook/src/nsAddrDatabase.cpp
mailnews/base/search/src/nsMsgFilterList.cpp
mailnews/base/search/src/nsMsgLocalSearch.cpp
mailnews/base/search/src/nsMsgSearchTerm.cpp
mailnews/base/src/nsSpamSettings.cpp
mailnews/compose/src/nsMsgCompose.cpp
mailnews/local/src/nsLocalMailFolder.cpp
mailnews/local/src/nsPop3Sink.cpp
mailnews/mime/src/mimemoz2.cpp
--- a/mailnews/addrbook/src/nsAbCardProperty.cpp
+++ b/mailnews/addrbook/src/nsAbCardProperty.cpp
@@ -370,36 +370,26 @@ NS_IMETHODIMP nsAbCardProperty::HasEmail
                                                 PRBool *aResult)
 {
   NS_ENSURE_ARG_POINTER(aResult);
 
   *aResult = PR_FALSE;
 
   nsCString emailAddress;
   nsresult rv = GetPropertyAsAUTF8String(kPriEmailProperty, emailAddress);
-#ifdef MOZILLA_INTERNAL_API
   if (rv != NS_ERROR_NOT_AVAILABLE &&
       emailAddress.Equals(aEmailAddress, nsCaseInsensitiveCStringComparator()))
-#else
-  if (rv != NS_ERROR_NOT_AVAILABLE &&
-      emailAddress.Equals(aEmailAddress, CaseInsensitiveCompare))
-#endif
   {
     *aResult = PR_TRUE;
     return NS_OK;
   }
 
   rv = GetPropertyAsAUTF8String(k2ndEmailProperty, emailAddress);
-#ifdef MOZILLA_INTERNAL_API
   if (rv != NS_ERROR_NOT_AVAILABLE &&
       emailAddress.Equals(aEmailAddress, nsCaseInsensitiveCStringComparator()))
-#else
-  if (rv != NS_ERROR_NOT_AVAILABLE &&
-      emailAddress.Equals(aEmailAddress, CaseInsensitiveCompare))
-#endif
     *aResult = PR_TRUE;
 
   return NS_OK;
 }
 
 // This function may be overridden by derived classes for
 // nsAb*Card specific implementations.
 NS_IMETHODIMP nsAbCardProperty::Copy(nsIAbCard* srcCard)
--- a/mailnews/addrbook/src/nsAbDirectoryQuery.cpp
+++ b/mailnews/addrbook/src/nsAbDirectoryQuery.cpp
@@ -43,16 +43,17 @@
 #include "nsAbBooleanExpression.h"
 #include "nsArrayUtils.h"
 #include "nsIRDFResource.h"
 #include "nsComponentManagerUtils.h"
 #include "nsStringGlue.h"
 #include "nsUnicharUtils.h"
 #include "nsIAbDirSearchListener.h"
 #include "nsISimpleEnumerator.h"
+#include "nsMsgUtils.h"
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbDirectoryQuerySimpleBooleanExpression, nsIAbBooleanExpression)
 
 nsAbDirectoryQuerySimpleBooleanExpression::nsAbDirectoryQuerySimpleBooleanExpression() :
     mOperation (nsIAbBooleanOperationTypes::AND)
 {
 }
 
@@ -510,56 +511,32 @@ nsresult nsAbDirectoryQuery::matchCardCo
         case nsIAbBooleanConditionTypes::DoesNotContain:
 #ifdef MOZILLA_INTERNAL_API
             *matchFound = !FindInReadable(matchValue, value, nsCaseInsensitiveStringComparator());
 #else
             *matchFound = value.Find(matchValue, CaseInsensitiveCompare) == -1;
 #endif
             break;
         case nsIAbBooleanConditionTypes::Is:
-#ifdef MOZILLA_INTERNAL_API
             *matchFound = value.Equals(matchValue, nsCaseInsensitiveStringComparator());
-#else
-            *matchFound = value.Equals(matchValue, CaseInsensitiveCompare);
-#endif
             break;
         case nsIAbBooleanConditionTypes::IsNot:
-#ifdef MOZILLA_INTERNAL_API
             *matchFound = !value.Equals(matchValue, nsCaseInsensitiveStringComparator());
-#else
-            *matchFound = !value.Equals(matchValue, CaseInsensitiveCompare);
-#endif
             break;
         case nsIAbBooleanConditionTypes::BeginsWith:
-#ifdef MOZILLA_INTERNAL_API
             *matchFound = StringBeginsWith(value, matchValue, nsCaseInsensitiveStringComparator());
-#else
-            *matchFound = StringBeginsWith(value, matchValue, CaseInsensitiveCompare);
-#endif
             break;
         case nsIAbBooleanConditionTypes::LessThan:
-#ifdef MOZILLA_INTERNAL_API
             *matchFound = Compare(value, matchValue, nsCaseInsensitiveStringComparator()) < 0;
-#else
-            *matchFound = value.Compare(matchValue, CaseInsensitiveCompare) < 0;
-#endif
             break;
         case nsIAbBooleanConditionTypes::GreaterThan:
-#ifdef MOZILLA_INTERNAL_API
             *matchFound = Compare(value, matchValue, nsCaseInsensitiveStringComparator()) > 0;
-#else
-            *matchFound = value.Compare(matchValue, CaseInsensitiveCompare) > 0;
-#endif
             break;
         case nsIAbBooleanConditionTypes::EndsWith:
-#ifdef MOZILLA_INTERNAL_API
             *matchFound = StringEndsWith(value, matchValue, nsCaseInsensitiveStringComparator());
-#else
-            *matchFound = StringEndsWith(value, matchValue, CaseInsensitiveCompare);
-#endif
             break;
         case nsIAbBooleanConditionTypes::SoundsLike:
         case nsIAbBooleanConditionTypes::RegExp:
             *matchFound = PR_FALSE;
             break;
         default:
             *matchFound = PR_FALSE;
     }
--- a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
+++ b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
@@ -44,16 +44,17 @@
 #include "nsIMsgHeaderParser.h"
 #include "nsILDAPMessage.h"
 #include "nsIStringBundle.h"
 #include "nsXPCOM.h"
 #include "nsISupportsPrimitives.h"
 #include "nsNetError.h"
 #include "nsMemory.h"
 #include "nsILDAPErrors.h"
+#include "nsMsgUtils.h"
 
 #define LDAP_ERROR_BUNDLE "chrome://mozldap/locale/ldap.properties"
 #define LDAP_AUTOCOMPLETE_ERROR_BUNDLE "chrome://messenger/locale/addressbook/ldapAutoCompErrs.properties"
 
 NS_IMPL_ISUPPORTS2(nsAbLDAPAutoCompFormatter, 
 		   nsILDAPAutoCompFormatter, 
 		   nsIAbLDAPAutoCompFormatter)
 
@@ -482,21 +483,17 @@ nsAbLDAPAutoCompFormatter::ProcessFormat
             }
 
             // if we're building an array
             if ( aAttrs ) { 
 
                 // see if the string is already present in the array
                 int i = 0, found = -1;
                 while ( i < aAttrs->Count() ) {
-#ifdef MOZILLA_INTERNAL_API
                     if (aAttrs->CStringAt(i)->Equals(attrName, nsCaseInsensitiveCStringComparator())) {
-#else
-                    if (aAttrs->CStringAt(i)->Equals(attrName, CaseInsensitiveCompare)) {
-#endif
                         found = i;
                         break;
                     }
                     ++i;
                 }
 
                 // and it doesn't already contain this string
                 if (found == -1) { 
--- a/mailnews/addrbook/src/nsAddrDatabase.cpp
+++ b/mailnews/addrbook/src/nsAddrDatabase.cpp
@@ -3261,25 +3261,19 @@ nsAddrDatabase::GetRowForCharColumn(cons
     nsresult rv = rowCursor->NextRow(m_mdbEnv, getter_AddRefs(currentRow), &rowPos);
     if (currentRow && NS_SUCCEEDED(rv))
     {
       mdbOid rowOid;
       if ((currentRow->GetOid(m_mdbEnv, &rowOid) == NS_OK) && (rowOid.mOid_Scope == targetScope))
       {
         rv = GetStringColumn(currentRow, findColumn, columnValue);
 
-#ifdef MOZILLA_INTERNAL_API
         PRBool equals = aCaseInsensitive ?
           columnValue.Equals(unicodeStr, nsCaseInsensitiveStringComparator()) :
           columnValue.Equals(unicodeStr);
-#else
-        PRBool equals = aCaseInsensitive ?
-          columnValue.Equals(unicodeStr, CaseInsensitiveCompare) :
-          columnValue.Equals(unicodeStr);
-#endif
 
         if (NS_SUCCEEDED(rv) && equals)
         {
           NS_IF_ADDREF(*aFindRow = currentRow);
           if (aRowPos)
             *aRowPos = rowPos;
           return NS_OK;
         }
--- a/mailnews/base/search/src/nsMsgFilterList.cpp
+++ b/mailnews/base/search/src/nsMsgFilterList.cpp
@@ -539,42 +539,34 @@ nsresult nsMsgFilterList::LoadTextFilter
   nsresult  err = NS_OK;
   PRUint32 bytesAvailable;
   nsMsgFilterFileAttribValue attrib;
   nsCOMPtr<nsIMsgRuleAction> currentFilterAction;
   // We'd really like to move lot's of these into the objects that they refer to.
   do
   {
     nsCAutoString value;
-#ifdef MOZILLA_INTERNAL_API
-    PRInt32 intToStringResult;
-#else
     nsresult intToStringResult;
-#endif
 
     char curChar;
     curChar = LoadAttrib(attrib, aStream);
     if (curChar == (char) -1)  //reached eof
       break;
     err = LoadValue(value, aStream);
     if (err != NS_OK)
       break;
     switch(attrib)
     {
     case nsIMsgFilterList::attribNone:
       if (m_curFilter)
         m_curFilter->SetUnparseable(PR_TRUE);
       break;
     case nsIMsgFilterList::attribVersion:
       m_fileVersion = value.ToInteger(&intToStringResult, 10);
-#ifdef MOZILLA_INTERNAL_API
-      if (intToStringResult != 0)
-#else
       if (NS_FAILED(intToStringResult))
-#endif
       {
         attrib = nsIMsgFilterList::attribNone;
         NS_ASSERTION(PR_FALSE, "error parsing filter file version");
       }
       break;
     case nsIMsgFilterList::attribLogging:
       m_loggingEnabled = StrToBool(value);
       m_unparsedFilterBuffer.Truncate(); //we are going to buffer each filter as we read them, make sure no garbage is there
@@ -681,47 +673,31 @@ nsresult nsMsgFilterList::LoadTextFilter
           if (NS_SUCCEEDED(res))
             currentFilterAction->SetPriority(outPriority);
           else
             NS_ASSERTION(PR_FALSE, "invalid priority in filter file");
         }
         else if (type == nsMsgFilterAction::Label)
         {
           // upgrade label to corresponding tag/keyword
-#ifdef MOZILLA_INTERNAL_API
-          PRInt32 res;
-#else
           nsresult res;
-#endif
           PRInt32 labelInt = value.ToInteger(&res, 10);
-#ifdef MOZILLA_INTERNAL_API
-          if (res == 0)
-#else
           if (NS_SUCCEEDED(res))
-#endif
           {
             nsCAutoString keyword("$label");
             keyword.Append('0' + labelInt);
             currentFilterAction->SetType(nsMsgFilterAction::AddTag);
             currentFilterAction->SetStrValue(keyword);
           }
         }
         else if (type == nsMsgFilterAction::JunkScore)
         {
-#ifdef MOZILLA_INTERNAL_API
-          PRInt32 res;
-#else
           nsresult res;
-#endif
           PRInt32 junkScore = value.ToInteger(&res, 10);
-#ifdef MOZILLA_INTERNAL_API
-          if (!res)
-#else
           if (NS_FAILED(res))
-#endif
             currentFilterAction->SetJunkScore(junkScore);
         }
         else if (type == nsMsgFilterAction::Forward ||
                  type == nsMsgFilterAction::Reply ||
                  type == nsMsgFilterAction::AddTag ||
                  type == nsMsgFilterAction::Custom)
         {
           currentFilterAction->SetStrValue(value);
@@ -1151,21 +1127,17 @@ NS_IMETHODIMP nsMsgFilterList::MatchOrCh
 
       if (actionType == nsMsgFilterAction::MoveToFolder ||
           actionType == nsMsgFilterAction::CopyToFolder)
       {
         rv = filterAction->GetTargetFolderUri(folderUri);
         if (NS_SUCCEEDED(rv) && !folderUri.IsEmpty())
            if (caseInsensitive)
           {
-#ifdef MOZILLA_INTERNAL_API
              if (folderUri.Equals(oldFolderUri, nsCaseInsensitiveCStringComparator())) //local
-#else
-             if (folderUri.Equals(oldFolderUri, CaseInsensitiveCompare))
-#endif
             {
               if (!newFolderUri.IsEmpty())  //if we just want to match the uri's, newFolderUri will be null
                 rv = filterAction->SetTargetFolderUri(newFolderUri);
               NS_ENSURE_SUCCESS(rv,rv);
               *found =PR_TRUE;
             }
           }
           else
--- a/mailnews/base/search/src/nsMsgLocalSearch.cpp
+++ b/mailnews/base/search/src/nsMsgLocalSearch.cpp
@@ -598,21 +598,17 @@ nsresult nsMsgSearchOfflineMail::Process
          err = aTerm->MatchJunkStatus(junkScoreStr.get(), &result);
          break;
       }
       case nsMsgSearchAttrib::JunkPercent:
       {
         // When the junk status is set by the plugin, use junkpercent (if available)
         // Otherwise, use the limits (0 or 100) depending on the junkscore.
         PRUint32 junkPercent;
-#ifdef MOZILLA_INTERNAL_API
-        PRInt32 rv;
-#else
         nsresult rv;
-#endif
         nsCString junkScoreOriginStr;
         nsCString junkPercentStr;
         msgToMatch->GetStringProperty("junkscoreorigin", getter_Copies(junkScoreOriginStr));
         msgToMatch->GetStringProperty("junkpercent", getter_Copies(junkPercentStr));
         if ( junkScoreOriginStr.Equals(NS_LITERAL_CSTRING("plugin")) &&
             !junkPercentStr.IsEmpty())
         {
           junkPercent = junkPercentStr.ToInteger(&rv, 10);
--- a/mailnews/base/search/src/nsMsgSearchTerm.cpp
+++ b/mailnews/base/search/src/nsMsgSearchTerm.cpp
@@ -805,21 +805,17 @@ nsresult nsMsgSearchTerm::MatchArbitrary
     // this handles wrapped header lines, which start with whitespace.
     // If the line starts with whitespace, then we use the current header.
     if (!isContinuationHeader)
     {
       PRUint32 colonPos = buf.FindChar(':');
       curMsgHeader = StringHead(buf, colonPos);
     }
 
-#ifdef MOZILLA_INTERNAL_API
     if (curMsgHeader.Equals(m_arbitraryHeader, nsCaseInsensitiveCStringComparator()))
-#else
-    if (curMsgHeader.Equals(m_arbitraryHeader, CaseInsensitiveCompare))
-#endif
     {
       // value occurs after the header name or whitespace continuation char.
       const char * headerValue = buf.get() + (isContinuationHeader ? 1 : headerLength);
       if (headerValue < buf_end && headerValue[0] == ':')  // + 1 to account for the colon which is MANDATORY
         headerValue++;
 
       // strip leading white space
       while (headerValue < buf_end && isspace(*headerValue))
@@ -1126,57 +1122,41 @@ nsresult nsMsgSearchTerm::MatchString (c
 #ifdef MOZILLA_INTERNAL_API
     if (!CaseInsensitiveFindInReadable(needle, utf16StrToMatch))
 #else
     if (utf16StrToMatch.Find(needle, CaseInsensitiveCompare) == -1);
 #endif
       result = PR_TRUE;
     break;
   case nsMsgSearchOp::Is:
-#ifdef MOZILLA_INTERNAL_API
     if(needle.Equals(utf16StrToMatch, nsCaseInsensitiveStringComparator()))
-#else
-    if(needle.Equals(utf16StrToMatch, CaseInsensitiveCompare))
-#endif
       result = PR_TRUE;
     break;
   case nsMsgSearchOp::Isnt:
-#ifdef MOZILLA_INTERNAL_API
     if(!needle.Equals(utf16StrToMatch, nsCaseInsensitiveStringComparator()))
-#else
-    if(!needle.Equals(utf16StrToMatch, CaseInsensitiveCompare))
-#endif
       result = PR_TRUE;
     break;
   case nsMsgSearchOp::IsEmpty:
     // For IsEmpty, we didn't copy stringToMatch to utf16StrToMatch.
     if (!PL_strlen(stringToMatch))
       result = PR_TRUE;
     break;
   case nsMsgSearchOp::IsntEmpty:
     // For IsntEmpty, we didn't copy stringToMatch to utf16StrToMatch.
     if (PL_strlen(stringToMatch))
       result = PR_TRUE;
     break;
   case nsMsgSearchOp::BeginsWith:
-#ifdef MOZILLA_INTERNAL_API
     if (StringBeginsWith(utf16StrToMatch, needle,
                          nsCaseInsensitiveStringComparator()))
-#else
-    if (StringBeginsWith(utf16StrToMatch, needle, CaseInsensitiveCompare))
-#endif
       result = PR_TRUE;
     break;
   case nsMsgSearchOp::EndsWith:
-#ifdef MOZILLA_INTERNAL_API
     if (StringEndsWith(utf16StrToMatch, needle,
                        nsCaseInsensitiveStringComparator()))
-#else
-    if (StringEndsWith(utf16StrToMatch, needle, CaseInsensitiveCompare))
-#endif
       result = PR_TRUE;
     break;
   default:
     NS_ASSERTION(PR_FALSE, "invalid operator matching search results");
   }
 
   *pResult = result;
   return err;
@@ -1825,31 +1805,22 @@ NS_IMPL_GETSET(nsMsgSearchTerm, EndsGrou
 // Certain possible standard values of a message database row also sometimes
 // appear as header values. To prevent a naming collision, we use all
 // lower case for the standard headers, and first capital when those
 // same strings are requested as arbitrary headers. This routine is used
 // when setting arbitrary headers.
 //
 void nsMsgSearchTerm::ToLowerCaseExceptSpecials(nsACString &aValue)
 {
-#ifdef MOZILLA_INTERNAL_API
   if (NS_LITERAL_CSTRING("Sender").Equals(aValue, nsCaseInsensitiveCStringComparator()))
     aValue.Assign(NS_LITERAL_CSTRING("Sender"));
   else if (NS_LITERAL_CSTRING("Date").Equals(aValue, nsCaseInsensitiveCStringComparator()))
     aValue.Assign(NS_LITERAL_CSTRING("Date"));
   else if (NS_LITERAL_CSTRING("Status").Equals(aValue, nsCaseInsensitiveCStringComparator()))
     aValue.Assign(NS_LITERAL_CSTRING("Status"));
-#else
-  if (NS_LITERAL_CSTRING("Sender").Equals(aValue, CaseInsensitiveCompare))
-    aValue.Assign(NS_LITERAL_CSTRING("Sender"));
-  else if (NS_LITERAL_CSTRING("Date").Equals(aValue, CaseInsensitiveCompare))
-    aValue.Assign(NS_LITERAL_CSTRING("Date"));
-  else if (NS_LITERAL_CSTRING("Status").Equals(aValue, CaseInsensitiveCompare))
-    aValue.Assign(NS_LITERAL_CSTRING("Status"));
-#endif
   else
     ToLowerCase(aValue);
 }
 
 
 //-----------------------------------------------------------------------------
 // nsMsgSearchScopeTerm implementation
 //-----------------------------------------------------------------------------
--- a/mailnews/base/src/nsSpamSettings.cpp
+++ b/mailnews/base/src/nsSpamSettings.cpp
@@ -844,23 +844,18 @@ NS_IMETHODIMP nsSpamSettings::CheckWhite
   if (authorEmailAddress.IsEmpty())
     return NS_OK;
 
   // should we skip whitelisting for the identity email?
   if (mInhibitWhiteListingIdentityUser)
   {
     for (PRUint32 i = 0; i < mEmails.Length(); ++i)
     {
-#ifdef MOZILLA_INTERNAL_API
       if (mEmails[i].Equals(authorEmailAddress, nsCaseInsensitiveCStringComparator()))
         return NS_OK;
-#else
-      if (mEmails[i].Equals(authorEmailAddress, CaseInsensitiveCompare))
-        return NS_OK;
-#endif
     }
   }
 
   if (!mTrustedMailDomains.IsEmpty() || mInhibitWhiteListingIdentityDomain)
   {
     nsCAutoString domain;
     PRInt32 atPos = authorEmailAddress.FindChar('@');
     if (atPos >= 0)
@@ -878,23 +873,18 @@ NS_IMETHODIMP nsSpamSettings::CheckWhite
       {
         for (PRUint32 i = 0; i < mEmails.Length(); ++i)
         {
           nsCAutoString identityDomain;
           PRInt32 atPos = mEmails[i].FindChar('@');
           if (atPos >= 0)
           {
             identityDomain = Substring(mEmails[i], atPos + 1);
-#ifdef MOZILLA_INTERNAL_API
             if (identityDomain.Equals(domain, nsCaseInsensitiveCStringComparator()))
               return NS_OK; // don't whitelist
-#else
-            if (identityDomain.Equals(domain, CaseInsensitiveCompare))
-              return NS_OK;
-#endif
           }
         }
       }
     }
   }
 
   if (mWhiteListDirArray.Count())
   {
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -4797,21 +4797,17 @@ nsMsgCompose::CheckAndPopulateRecipients
                 {
                   // TB 2 wrote the popularity value as hex, so if we get here,
                   // then we've probably got a hex value. We'll convert it back
                   // to decimal, as that's the best we can do.
 
                   nsCString hexPopularity;
                   if (NS_SUCCEEDED(existingCard->GetPropertyAsAUTF8String(kPopularityIndexProperty, hexPopularity)))
                   {
-#ifdef MOZILLA_INTERNAL_API
-                    PRInt32 errorCode = 0;
-#else
                     nsresult errorCode = NS_OK;
-#endif
                     popularityIndex = hexPopularity.ToInteger(&errorCode, 16);
                     if (errorCode)
                       // We failed, just set it to zero.
                       popularityIndex = 0;
                   }                   
                   else
                     // We couldn't get it as a string either, so just reset to
                     // zero.
--- a/mailnews/local/src/nsLocalMailFolder.cpp
+++ b/mailnews/local/src/nsLocalMailFolder.cpp
@@ -1149,21 +1149,17 @@ NS_IMETHODIMP nsMsgLocalMailFolder::Rena
   NS_MsgHashIfNecessary(safeName);
   nsCAutoString newDiskName;
   if (NS_FAILED(NS_CopyUnicodeToNative(safeName, newDiskName)))
     return NS_ERROR_FAILURE;
 
   nsCAutoString oldLeafName;
   oldPathFile->GetNativeLeafName(oldLeafName);
 
-#ifdef MOZILLA_INTERNAL_API
   if (mName.Equals(aNewName, nsCaseInsensitiveStringComparator()))
-#else
-  if (mName.Equals(aNewName, CaseInsensitiveCompare))
-#endif
   {
     if (msgWindow)
       rv = ThrowAlertMsg("folderExists", msgWindow);
     return NS_MSG_FOLDER_EXISTS;
   }
 
   nsCOMPtr<nsILocalFile> parentPathFile;
   parentFolder->GetFilePath(getter_AddRefs(parentPathFile));
--- a/mailnews/local/src/nsPop3Sink.cpp
+++ b/mailnews/local/src/nsPop3Sink.cpp
@@ -208,23 +208,18 @@ nsPop3Sink::FindPartialMessages(nsILocal
           break;
       }
       rv = localFolder->GetUidlFromFolder(&folderScanState, msgDBHdr);
       if (!NS_SUCCEEDED(rv))
         break;
 
       // If we got the uidl, see if this partial message belongs to this
       // account. Add it to the array if so...
-#ifdef MOZILLA_INTERNAL_API
       if (folderScanState.m_uidl && 
           m_accountKey.Equals(folderScanState.m_accountKey, nsCaseInsensitiveCStringComparator()))
-#else
-      if (folderScanState.m_uidl &&
-          m_accountKey.Equals(folderScanState.m_accountKey, CaseInsensitiveCompare))
-#endif
       {
         partialRecord *partialMsg = new partialRecord();
         if (partialMsg)
         {
           partialMsg->m_uidl = folderScanState.m_uidl;
           partialMsg->m_msgDBHdr = msgDBHdr;
           m_partialMsgsArray.AppendElement(partialMsg);
         }
--- a/mailnews/mime/src/mimemoz2.cpp
+++ b/mailnews/mime/src/mimemoz2.cpp
@@ -449,23 +449,18 @@ GenerateAttachmentData(MimeObject *objec
   {
     urlString.Append("&filename=");
     nsCAutoString aResult;
     if (NS_SUCCEEDED(MsgEscapeString(nsDependentCString(tmp->real_name),
                                      nsINetUtil::ESCAPE_XALPHAS, aResult)))
       urlString.Append(aResult);
     else
       urlString.Append(tmp->real_name);
-#ifdef MOZILLA_INTERNAL_API
     if (tmp->real_type && !strcmp(tmp->real_type, "message/rfc822") &&
            !StringEndsWith(urlString, NS_LITERAL_CSTRING(".eml"), nsCaseInsensitiveCStringComparator()))
-#else
-    if (tmp->real_type && !strcmp(tmp->real_type, "message/rfc822") &&
-           !StringEndsWith(urlString, NS_LITERAL_CSTRING(".eml"), CaseInsensitiveCompare))
-#endif
       urlString.Append(".eml");
   }
   nsresult rv = nsMimeNewURI(&(tmp->url), urlString.get(), nsnull);
 
   PR_FREEIF(urlSpec);
 
   if ( (NS_FAILED(rv)) || (!tmp->url) )
     return NS_ERROR_OUT_OF_MEMORY;