diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-02-26 17:41:20 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2021-02-26 17:41:20 +0000 |
| commit | 78444682d79c6d65eab06ed847c8aba811ac43f1 (patch) | |
| tree | f7d40d4d0d2f50d835fe29ca5fb3581f0ea618c3 | |
| parent | ad5a13bd501e379517da1a944c104a11d951a3f5 (diff) | |
| parent | 9b0d589d9f925169a15b69e98e72f2f55393c4d3 (diff) | |
| download | uxp-78444682d79c6d65eab06ed847c8aba811ac43f1.tar.gz | |
Merge pull request '[widget] MailNews Followup: Require user interaction when picking files or folders v2' (#1745) from g4jc/UXP:master into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1745
| -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 ca640248e2..3ba936e3f1 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 a13c4adbc4..953b462b6a 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)); |