From f2bc0785b9852dae1b6f5c700fbca41e573aa916 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 13 Apr 2018 22:06:20 +0200 Subject: Convert MOZILLA_OFFICIAL conditionals to MC_OFFICIAL where needed. - `--enable-official-branding` implies `MC_OFFICIAL` (no need to specifically set it) - `--enable-official-vendor` can be used to set `MC_OFFICIAL` on builds without `--enable-official-branding` that should still be considered official release versions. - `MC_OFFICIAL` implies `--enable-release`, meaning `DEVELOPER_OPTIONS` isn't set - `MC_OFFICIAL` makes `nsXULAppInfo.getIsOfficial` return `true` - `MC_OFFICIAL` makes `AppConstants.MOZILLA_OFFICIAL` (for compatibility in extensions) and `AppConstants.MC_OFFICIAL` return `true` - Optional, for the time being: `MOZILLA_OFFICIAL` is still present in some places in case someone wants to build a Mozilla-alike official application and has the rights and necessary keys to use Mozilla-official third-party services. This must always be combined with `MC_OFFICIAL` to have a sane combination of defines. This may be removed in the future. --- browser/modules/AboutHome.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'browser') diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm index 8c0fc4c15..639194c20 100644 --- a/browser/modules/AboutHome.jsm +++ b/browser/modules/AboutHome.jsm @@ -47,7 +47,7 @@ this.AboutHomeUtils = { return !Services.prefs.getBoolPref("browser.EULA.override"); } catch (e) { } - if (!AppConstants.MOZILLA_OFFICIAL) { + if (!AppConstants.MC_OFFICIAL) { // Non-official builds shouldn't show the notification. return false; } -- cgit v1.2.3