wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-29 11:57:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '9031ee4017' into custom

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
mailnews/addrbook/src/nsAbManager.cpp
View file

@ -544,7 +544,7 @@ NS_IMETHODIMP nsAbManager::ExportAddressBook(mozIDOMWindowProxy *aParentWin, nsI
ArrayLength(formatStrings), getter_Copies(title)); ArrayLength(formatStrings), getter_Copies(title));
NS_ENSURE_SUCCESS(rv, rv); 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); NS_ENSURE_SUCCESS(rv, rv);
filePicker->SetDefaultString(dirName); filePicker->SetDefaultString(dirName);

10
mailnews/base/src/nsMessenger.cpp
View file

@ -358,7 +358,7 @@ nsMessenger::PromptIfFileExists(nsIFile *file)
GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr); GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr);
filePicker->Init(mWindow, filePicker->Init(mWindow,
saveAttachmentStr, saveAttachmentStr,
nsIFilePicker::modeSave, /*aRequireInteraction = */ false); nsIFilePicker::modeSave, false);
filePicker->SetDefaultString(path); filePicker->SetDefaultString(path);
filePicker->AppendFilters(nsIFilePicker::filterAll); filePicker->AppendFilters(nsIFilePicker::filterAll);
@ -816,7 +816,7 @@ nsMessenger::SaveOneAttachment(const char * aContentType, const char * aURL,
GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr); GetString(NS_LITERAL_STRING("SaveAttachment"), saveAttachmentStr);
filePicker->Init(mWindow, saveAttachmentStr, filePicker->Init(mWindow, saveAttachmentStr,
nsIFilePicker::modeSave, /*aRequireInteraction = */ false); nsIFilePicker::modeSave, false);
filePicker->SetDefaultString(defaultDisplayString); filePicker->SetDefaultString(defaultDisplayString);
// Check if the attachment file name has an extension (which must not // 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); GetString(NS_LITERAL_STRING("SaveAllAttachments"), saveAttachmentStr);
filePicker->Init(mWindow, filePicker->Init(mWindow,
saveAttachmentStr, saveAttachmentStr,
nsIFilePicker::modeGetFolder, /*aRequireInteraction = */ false); nsIFilePicker::modeGetFolder, false);
rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir)); rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir));
if (NS_SUCCEEDED(rv) && lastSaveDir) if (NS_SUCCEEDED(rv) && lastSaveDir)
@ -1195,7 +1195,7 @@ nsMessenger::GetSaveAsFile(const nsAString& aMsgFilename, int32_t *aSaveAsFileTy
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsString saveMailAsStr; nsString saveMailAsStr;
GetString(NS_LITERAL_STRING("SaveMailAs"), 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 we have a non-null filename use it, otherwise use default save message one
if (aMsgFilename.IsEmpty()) if (aMsgFilename.IsEmpty())
@ -1318,7 +1318,7 @@ nsMessenger::GetSaveToDir(nsIFile **aSaveDir)
nsString chooseFolderStr; nsString chooseFolderStr;
GetString(NS_LITERAL_STRING("ChooseFolder"), 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; nsCOMPtr<nsIFile> lastSaveDir;
rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir)); rv = GetLastSaveDirectory(getter_AddRefs(lastSaveDir));

2
parser/html/nsHtml5MetaScanner.cpp
View file

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

2
parser/html/nsHtml5MetaScanner.h
View file

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

2
parser/html/nsHtml5Tokenizer.h
View file

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