From 9149f54e1a65da399c3cb6aa977c1c47107e816d Mon Sep 17 00:00:00 2001 From: roytam1 Date: Fri, 26 Feb 2021 09:13:48 +0800 Subject: [PATCH] mailnews: fix build after API changes in "[widget] Require user interaction when picking files or folders v2" --- mailnews/addrbook/src/nsAbManager.cpp | 2 +- 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..a863fd1160 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, /*aRequireInteraction = */ 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..3bd3cdfcf7 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, /*aRequireInteraction = */ 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, /*aRequireInteraction = */ 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, /*aRequireInteraction = */ 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, /*aRequireInteraction = */ 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, /*aRequireInteraction = */ false); nsCOMPtr lastSaveDir; rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir));