From 99cde7ce7b4bb6bee9412f671748d16701d0ab9a Mon Sep 17 00:00:00 2001 From: Gaming4JC Date: Fri, 26 Feb 2021 11:57:24 -0500 Subject: [PATCH 1/2] [widget] MailNews Followup: Require user interaction when picking files or folders v2 98f6ad61f4f3c66209036db4bc7a4ae6ff4d1d3d introduced a boolean, this just passes it down and fixes build bustage of mailnews. --- 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..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 lastSaveDir; rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir)); From 9031ee4017257445652793d3245c40afbf833990 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Tue, 2 Mar 2021 12:01:30 +0000 Subject: [PATCH 2/2] [parser] run java translation. --- parser/html/nsHtml5MetaScanner.cpp | 2 +- parser/html/nsHtml5MetaScanner.h | 2 +- parser/html/nsHtml5Tokenizer.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parser/html/nsHtml5MetaScanner.cpp b/parser/html/nsHtml5MetaScanner.cpp index f7beddafd5..04c43717df 100644 --- a/parser/html/nsHtml5MetaScanner.cpp +++ b/parser/html/nsHtml5MetaScanner.cpp @@ -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 diff --git a/parser/html/nsHtml5MetaScanner.h b/parser/html/nsHtml5MetaScanner.h index a25acd213c..6af25efe67 100644 --- a/parser/html/nsHtml5MetaScanner.h +++ b/parser/html/nsHtml5MetaScanner.h @@ -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 diff --git a/parser/html/nsHtml5Tokenizer.h b/parser/html/nsHtml5Tokenizer.h index 4572cc8478..0e36226e61 100644 --- a/parser/html/nsHtml5Tokenizer.h +++ b/parser/html/nsHtml5Tokenizer.h @@ -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.