Issue #65 - Remove AppConstants from mailnews/

2 files changed, 7 insertions, 5 deletions

diff --git a/mailnews/base/src/moz.build b/mailnews/base/src/moz.build
index 55dbab154..69090b3b3 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);