diff options
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/content/jar.mn | 2 | ||||
| -rw-r--r-- | toolkit/modules/AppConstants.jsm | 13 | ||||
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index f9ac19a24..851c72250 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -12,7 +12,7 @@ toolkit.jar: content/global/about.xhtml content/global/aboutAbout.js content/global/aboutAbout.xhtml -#ifdef MOZILLA_OFFICIAL +#ifdef MC_OFFICIAL content/global/aboutRights.xhtml #else content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml) diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 93acea0ec..2b18f3c1a 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -36,11 +36,18 @@ this.AppConstants = Object.freeze({ false, #endif - // Official corresponds, roughly, to whether this build is performed - // on Mozilla's continuous integration infrastructure. You should + // Official corresponds to whether this build is considered an + // official, branded release for the public. You should // disable developer-only functionality when this flag is set. + // MOZILLA_OFFICIAL is deprecated but kept for extension compatibility. MOZILLA_OFFICIAL: -#ifdef MOZILLA_OFFICIAL +#ifdef MC_OFFICIAL + true, +#else + false, +#endif + MC_OFFICIAL: +#ifdef MC_OFFICIAL true, #else false, diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index b65a4093f..530e4a353 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -1023,7 +1023,7 @@ nsXULAppInfo::GetDistributionID(nsACString& aResult) NS_IMETHODIMP nsXULAppInfo::GetIsOfficial(bool* aResult) { -#ifdef MOZILLA_OFFICIAL +#ifdef MC_OFFICIAL *aResult = true; #else *aResult = false; |