diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 21:49:04 +0200 |
| commit | 39dac57259cff8b61db0b22cb2ad0a8adb02692e (patch) | |
| tree | 52a026cc8c22793eb17fd0f5e22adce1ae08a1dd /mailnews/base | |
| parent | a1cce3b2b00bbd9f4983013ddd8934a7bccb9e99 (diff) | |
| parent | c2d9ab62f3d097c9e0e00184cab1f546554f5eaa (diff) | |
| download | UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.gz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.lz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.tar.xz UXP-39dac57259cff8b61db0b22cb2ad0a8adb02692e.zip | |
Merge branch 'redwood' into 28.9-platform
Diffstat (limited to 'mailnews/base')
| -rw-r--r-- | mailnews/base/search/content/searchWidgets.xml | 2 | ||||
| -rw-r--r-- | mailnews/base/src/moz.build | 6 | ||||
| -rw-r--r-- | mailnews/base/src/nsMailNewsCommandLineHandler.js | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/mailnews/base/search/content/searchWidgets.xml b/mailnews/base/search/content/searchWidgets.xml index 69f3b2ae2..1f3960442 100644 --- a/mailnews/base/search/content/searchWidgets.xml +++ b/mailnews/base/search/content/searchWidgets.xml @@ -224,7 +224,7 @@ let identitiesRaw = MailServices.accounts .getIdentitiesForServer(gFilterList.folder.server); let identities = Array.from(this.fixIterator(identitiesRaw, - Ci.nsIMsgIdentity)); + Components.interfaces.nsIMsgIdentity)); if (identities.length == 0) { // typically if this is Local Folders if (MailServices.accounts.defaultAccount) diff --git a/mailnews/base/src/moz.build b/mailnews/base/src/moz.build index 55dbab154..034d2e9bb 100644 --- a/mailnews/base/src/moz.build +++ b/mailnews/base/src/moz.build @@ -69,13 +69,15 @@ EXTRA_COMPONENTS += [ 'folderLookupService.js', 'msgAsyncPrompter.js', 'newMailNotificationService.js', - 'nsMailNewsCommandLineHandler.js', ] if CONFIG['MOZ_MAILNEWS_OAUTH2']: EXTRA_COMPONENTS += ['msgOAuth2Module.js'] -EXTRA_PP_COMPONENTS += ['msgBase.manifest'] +EXTRA_PP_COMPONENTS += [ + 'msgBase.manifest', + 'nsMailNewsCommandLineHandler.js', +] EXTRA_JS_MODULES += [ 'virtualFolderWrapper.js', diff --git a/mailnews/base/src/nsMailNewsCommandLineHandler.js b/mailnews/base/src/nsMailNewsCommandLineHandler.js index 3a85ec336..5dda7f7dc 100644 --- a/mailnews/base/src/nsMailNewsCommandLineHandler.js +++ b/mailnews/base/src/nsMailNewsCommandLineHandler.js @@ -8,7 +8,6 @@ var Cr = Components.results; Components.utils.import("resource://gre/modules/Services.jsm"); Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); -Components.utils.import("resource://gre/modules/AppConstants.jsm"); var MAPI_STARTUP_ARG = "MapiStartup"; var MESSAGE_ID_PARAM = "?messageid="; @@ -88,8 +87,8 @@ var nsMailNewsCommandLineHandler = aCommandLine.preventDefault = true; MailUtils.displayMessage(msgHdr); } - else if (AppConstants.MOZ_APP_NAME == "seamonkey" && - /\.(eml|msg)$/i.test(mailURL)) { +#ifdef MOZ_SUITE + else if (/\.(eml|msg)$/i.test(mailURL)) { try { let file = aCommandLine.resolveFile(mailURL);
// No point in trying to open a file if it doesn't exist or is empty
@@ -109,6 +108,7 @@ var nsMailNewsCommandLineHandler = catch (e) { } } +#endif else { dump("Unrecognized URL: " + mailURL + "\n"); Services.console.logStringMessage("Unrecognized URL: " + mailURL); |