Merge remote-tracking branch 'origin/master' into custom

mailnews/base/prefs/content/AccountWizard.xul

@@ -343,11 +343,7 @@
                   checked="true"/>
       </hbox>
       <spacer flex="1"/>
-#ifndef XP_MACOSX
       <description>&clickFinish.label;</description>
-#else
-      <description>&clickFinish.labelMac;</description>
-#endif
     </vbox>
   </wizardpage>
 

mailnews/base/search/src/nsMsgFilter.cpp

@@ -822,11 +822,6 @@ nsresult nsMsgFilter::ConvertMoveOrCopyToFolderValue(nsIMsgRuleAction *filterAct
         if (offset != -1)
           moveValue.Cut(offset, 4);
 
-#ifdef XP_MACOSX
-        nsCString unescapedMoveValue;
-        MsgUnescapeString(moveValue, 0, unescapedMoveValue);
-        moveValue = unescapedMoveValue;
-#endif
         destFolderUri.Append('/');
         if (filterVersion == k45Version)
         {

mailnews/base/src/nsMessenger.cpp

@@ -698,7 +698,6 @@ nsresult nsMessenger::SaveAttachment(nsIFile *aFile,
       saveListener->QueryInterface(NS_GET_IID(nsIStreamListener),
                                  getter_AddRefs(convertedListener));
 
-#ifndef XP_MACOSX
       // if the content type is bin hex we are going to do a hokey hack and make sure we decode the bin hex
       // when saving an attachment to disk..
       if (MsgLowerCaseEqualsLiteral(aContentType, APPLICATION_BINHEX))
@@ -713,7 +712,6 @@ nsresult nsMessenger::SaveAttachment(nsIFile *aFile,
                                                       channelSupport,
                                                       getter_AddRefs(convertedListener));
       }
-#endif
       nsCOMPtr<nsIURI> dummyNull;
       if (fetchService)
         rv = fetchService->FetchMimePart(URL, fullMessageUri.get(),
@@ -771,10 +769,6 @@ nsMessenger::SaveAttachmentToFolder(const nsACString& contentType, const nsACStr
   ConvertAndSanitizeFileName(PromiseFlatCString(displayName).get(), unescapedFileName);
   rv = attachmentDestination->Append(unescapedFileName);
   NS_ENSURE_SUCCESS(rv, rv);
-#ifdef XP_MACOSX
-  rv = attachmentDestination->CreateUnique(nsIFile::NORMAL_FILE_TYPE, ATTACHMENT_PERMISSION);
-  NS_ENSURE_SUCCESS(rv, rv);
-#endif
 
   rv = SaveAttachment(attachmentDestination, url, messageUri, contentType, nullptr, nullptr);
   attachmentDestination.swap(*aOutFile);

mailnews/base/src/nsMsgMailSession.cpp

@@ -353,11 +353,9 @@ NS_IMETHODIMP nsMsgMailSession::AddMsgWindow(nsIMsgWindow *msgWindow)
 NS_IMETHODIMP nsMsgMailSession::RemoveMsgWindow(nsIMsgWindow *msgWindow)
 {
   mWindows.RemoveObject(msgWindow);
-  // Mac keeps a hidden window open so the app doesn't shut down when
-  // the last window is closed. So don't shutdown the account manager in that
-  // case. Similarly, for suite, we don't want to disable mailnews when the
-  // last mail window is closed.
-#if !defined(XP_MACOSX) && !defined(MOZ_SUITE)
+  // For suite, we don't want to disable mailnews when the last mail window
+  // is closed (other component windows may still be open).
+#if !defined(MOZ_SUITE)
   if (!mWindows.Count())
   {
     nsresult rv;

mailnews/base/src/nsStatusBarBiffManager.cpp

@@ -136,13 +136,11 @@ nsresult nsStatusBarBiffManager::PlayBiffSound(const char *aPrefBranch)
       }
     }
   }
-#ifndef XP_MACOSX
   // if nothing played, play the default system sound
   if (!customSoundPlayed) {
     rv = mSound->PlayEventSound(nsISound::EVENT_NEW_MAIL_RECEIVED);
     NS_ENSURE_SUCCESS(rv, rv);
   }
-#endif
   return rv;
 }
 

mailnews/base/util/nsMsgUtils.cpp

@@ -611,7 +611,7 @@ nsresult NS_MsgCreatePathStringFromFolderURI(const char *aFolderURI,
     ? oldPath.FindChar('/', startSlashPos + 1) - 1 : oldPath.Length() - 1;
   if (endSlashPos < 0)
     endSlashPos = oldPath.Length();
-#if defined(XP_UNIX) || defined(XP_MACOSX)
+#if defined(XP_UNIX)
   bool isLocalUri = aScheme.EqualsLiteral("none") ||
                     aScheme.EqualsLiteral("pop3") ||
                     aScheme.EqualsLiteral("rss");
@@ -636,7 +636,7 @@ nsresult NS_MsgCreatePathStringFromFolderURI(const char *aFolderURI,
           CopyUTF16toMUTF7(pathPiece, tmp);
           CopyASCIItoUTF16(tmp, pathPiece);
       }
-#if defined(XP_UNIX) || defined(XP_MACOSX)
+#if defined(XP_UNIX)
       // Don't hash path pieces because local mail folder uri's have already
       // been hashed. We're only doing this on the mac to limit potential
       // regressions.