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

Issue #65 - Remove AppConstants from mailnews/

Browse source
This commit is contained in:
Matt A. Tobin 2020-02-01 21:54:04 -05:00 • committed by Roy Tam
commit b73780a36d
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mailnews/base/src/moz.build
View file

@ -69,13 +69,15 @@ EXTRA_COMPONENTS += [
'folderLookupService.js', 'folderLookupService.js',
'msgAsyncPrompter.js', 'msgAsyncPrompter.js',
'newMailNotificationService.js', 'newMailNotificationService.js',
'nsMailNewsCommandLineHandler.js',
] ]
if CONFIG['MOZ_MAILNEWS_OAUTH2']: if CONFIG['MOZ_MAILNEWS_OAUTH2']:
EXTRA_COMPONENTS += ['msgOAuth2Module.js'] EXTRA_COMPONENTS += ['msgOAuth2Module.js']
EXTRA_PP_COMPONENTS += ['msgBase.manifest'] EXTRA_PP_COMPONENTS += [
'msgBase.manifest'
'nsMailNewsCommandLineHandler.js',
]
EXTRA_JS_MODULES += [ EXTRA_JS_MODULES += [
'virtualFolderWrapper.js', 'virtualFolderWrapper.js',

6
mailnews/base/src/nsMailNewsCommandLineHandler.js
View file

@ -8,7 +8,6 @@ var Cr = Components.results;
Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/Services.jsm");
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/AppConstants.jsm");
var MAPI_STARTUP_ARG = "MapiStartup"; var MAPI_STARTUP_ARG = "MapiStartup";
var MESSAGE_ID_PARAM = "?messageid="; var MESSAGE_ID_PARAM = "?messageid=";
@ -88,8 +87,8 @@ var nsMailNewsCommandLineHandler =
aCommandLine.preventDefault = true; aCommandLine.preventDefault = true;
MailUtils.displayMessage(msgHdr); MailUtils.displayMessage(msgHdr);
} }
else if (AppConstants.MOZ_APP_NAME == "seamonkey" && #ifdef MOZ_SUITE
/\.(eml|msg)$/i.test(mailURL)) { else if (/\.(eml|msg)$/i.test(mailURL)) {
try { try {
let file = aCommandLine.resolveFile(mailURL); let file = aCommandLine.resolveFile(mailURL);
// No point in trying to open a file if it doesn't exist or is empty // No point in trying to open a file if it doesn't exist or is empty
@ -109,6 +108,7 @@ var nsMailNewsCommandLineHandler =
catch (e) { catch (e) {
} }
} }
#endif
else { else {
dump("Unrecognized URL: " + mailURL + "\n"); dump("Unrecognized URL: " + mailURL + "\n");
Services.console.logStringMessage("Unrecognized URL: " + mailURL); Services.console.logStringMessage("Unrecognized URL: " + mailURL);