Merge commit '9031ee4017' into custom

This commit is contained in:
roytam1 2021-03-04 09:34:15 +08:00
commit 4248e5ac2a
5 changed files with 9 additions and 9 deletions

View file

@ -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, /*aRequireInteraction = */ false);
rv = filePicker->Init(aParentWin, title, nsIFilePicker::modeSave, false);
NS_ENSURE_SUCCESS(rv, rv);
filePicker->SetDefaultString(dirName);

View file

@ -358,7 +358,7 @@ nsMessenger::PromptIfFileExists(nsIFile *file)
GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr);
filePicker->Init(mWindow,
saveAttachmentStr,
nsIFilePicker::modeSave, /*aRequireInteraction = */ false);
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, /*aRequireInteraction = */ false);
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, /*aRequireInteraction = */ false);
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, /*aRequireInteraction = */ false);
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, /*aRequireInteraction = */ false);
filePicker->Init(mWindow, chooseFolderStr, nsIFilePicker::modeGetFolder, false);
nsCOMPtr<nsIFile> lastSaveDir;
rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir));

View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2007 Henri Sivonen
* Copyright (c) 2008-2015 Mozilla Foundation
* Copyright (c) 2018-2020 Moonchild Productions
* Copyright (c) 2018-2021 Moonchild Productions
* Copyright (c) 2020 Binary Outcast
*
* Permission is hereby granted, free of charge, to any person obtaining a

View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2007 Henri Sivonen
* Copyright (c) 2008-2015 Mozilla Foundation
* Copyright (c) 2018-2020 Moonchild Productions
* Copyright (c) 2018-2021 Moonchild Productions
* Copyright (c) 2020 Binary Outcast
*
* Permission is hereby granted, free of charge, to any person obtaining a

View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2005-2007 Henri Sivonen
* Copyright (c) 2007-2015 Mozilla Foundation
* Copyright (c) 2018-2020 Moonchild Productions
* Copyright (c) 2018-2021 Moonchild Productions
* Copyright (c) 2020 Binary Outcast
* Portions of comments Copyright 2004-2010 Apple Computer, Inc., Mozilla
* Foundation, and Opera Software ASA.