diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-02-26 17:42:34 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-02-26 17:42:34 +0000 |
| commit | bb138fdc514d723734a9279428a3deda154baf2f (patch) | |
| tree | 0bd175de983b035bd52f6fd9c40090eb8601c45e | |
| parent | ceadffab6b357723981a429e11222daf6cd6dcfb (diff) | |
| parent | 78444682d79c6d65eab06ed847c8aba811ac43f1 (diff) | |
| download | UXP-bb138fdc514d723734a9279428a3deda154baf2f.tar UXP-bb138fdc514d723734a9279428a3deda154baf2f.tar.gz UXP-bb138fdc514d723734a9279428a3deda154baf2f.tar.lz UXP-bb138fdc514d723734a9279428a3deda154baf2f.tar.xz UXP-bb138fdc514d723734a9279428a3deda154baf2f.zip | |
Merge branch 'master' into releaseRELBASE_20210302RC_20210226
| -rw-r--r-- | mailnews/addrbook/src/nsAbManager.cpp | 2 | ||||
| -rw-r--r-- | mailnews/base/src/nsMessenger.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mailnews/addrbook/src/nsAbManager.cpp b/mailnews/addrbook/src/nsAbManager.cpp index ca640248e..3ba936e3f 100644 --- a/mailnews/addrbook/src/nsAbManager.cpp +++ b/mailnews/addrbook/src/nsAbManager.cpp @@ -544,7 +544,7 @@ NS_IMETHODIMP nsAbManager::ExportAddressBook(mozIDOMWindowProxy *aParentWin, nsI ArrayLength(formatStrings), getter_Copies(title)); NS_ENSURE_SUCCESS(rv, rv); - rv = filePicker->Init(aParentWin, title, nsIFilePicker::modeSave); + rv = filePicker->Init(aParentWin, title, nsIFilePicker::modeSave, false); NS_ENSURE_SUCCESS(rv, rv); filePicker->SetDefaultString(dirName); diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp index a13c4adbc..953b462b6 100644 --- a/mailnews/base/src/nsMessenger.cpp +++ b/mailnews/base/src/nsMessenger.cpp @@ -358,7 +358,7 @@ nsMessenger::PromptIfFileExists(nsIFile *file) GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr); filePicker->Init(mWindow, saveAttachmentStr, - nsIFilePicker::modeSave); + nsIFilePicker::modeSave, false); filePicker->SetDefaultString(path); filePicker->AppendFilters(nsIFilePicker::filterAll); @@ -816,7 +816,7 @@ nsMessenger::SaveOneAttachment(const char * aContentType, const char * aURL, GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr); filePicker->Init(mWindow, saveAttachmentStr, - nsIFilePicker::modeSave); + nsIFilePicker::modeSave, false); filePicker->SetDefaultString(defaultDisplayString); // Check if the attachment file name has an extension (which must not @@ -909,7 +909,7 @@ nsMessenger::SaveAllAttachments(uint32_t count, GetString(NS_LITERAL_STRING("SaveAllAttachments"), saveAttachmentStr); filePicker->Init(mWindow, saveAttachmentStr, - nsIFilePicker::modeGetFolder); + nsIFilePicker::modeGetFolder, false); rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir)); if (NS_SUCCEEDED(rv) && lastSaveDir) @@ -1195,7 +1195,7 @@ nsMessenger::GetSaveAsFile(const nsAString& aMsgFilename, int32_t *aSaveAsFileTy NS_ENSURE_SUCCESS(rv, rv); nsString saveMailAsStr; GetString(NS_LITERAL_STRING("SaveMailAs"), saveMailAsStr); - filePicker->Init(mWindow, saveMailAsStr, nsIFilePicker::modeSave); + filePicker->Init(mWindow, saveMailAsStr, nsIFilePicker::modeSave, false); // if we have a non-null filename use it, otherwise use default save message one if (aMsgFilename.IsEmpty()) @@ -1318,7 +1318,7 @@ nsMessenger::GetSaveToDir(nsIFile **aSaveDir) nsString chooseFolderStr; GetString(NS_LITERAL_STRING("ChooseFolder"), chooseFolderStr); - filePicker->Init(mWindow, chooseFolderStr, nsIFilePicker::modeGetFolder); + filePicker->Init(mWindow, chooseFolderStr, nsIFilePicker::modeGetFolder, false); nsCOMPtr<nsIFile> lastSaveDir; rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir)); |