From 01af8598698507ce11c3382ed71d2889da0e8c13 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 29 Jun 2019 11:26:21 -0400 Subject: [Pale Moon] Add a configure flag to functionally disable personas at build time --- application/palemoon/base/content/browser-addons.js | 3 ++- application/palemoon/base/content/browser.js | 2 ++ application/palemoon/base/content/browser.xul | 2 ++ application/palemoon/configure.in | 13 +++++++++++++ application/palemoon/confvars.sh | 3 +++ build/moz.configure/old.configure | 1 + 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/application/palemoon/base/content/browser-addons.js b/application/palemoon/base/content/browser-addons.js index f5c398f33..630a0cf79 100644 --- a/application/palemoon/base/content/browser-addons.js +++ b/application/palemoon/base/content/browser-addons.js @@ -263,7 +263,7 @@ var AddonsMgrListener = { onDisabled: function(aAddon) this.onUninstalled(), }; - +#ifdef MOZ_PERSONAS var LightWeightThemeWebInstaller = { handleEvent: function (event) { switch (event.type) { @@ -534,3 +534,4 @@ var LightweightThemeListener = { this.updateStyleSheet("url(" + themeData.headerURL + ")"); }, }; +#endif diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js index 16b7c0019..a5d77a90d 100644 --- a/application/palemoon/base/content/browser.js +++ b/application/palemoon/base/content/browser.js @@ -1216,9 +1216,11 @@ var gBrowserInit = { placesContext.addEventListener("popuphiding", updateEditUIVisibility, false); #endif +#ifdef MOZ_PERSONAS gBrowser.mPanelContainer.addEventListener("InstallBrowserTheme", LightWeightThemeWebInstaller, false, true); gBrowser.mPanelContainer.addEventListener("PreviewBrowserTheme", LightWeightThemeWebInstaller, false, true); gBrowser.mPanelContainer.addEventListener("ResetBrowserThemePreview", LightWeightThemeWebInstaller, false, true); +#endif // Bug 666808 - AeroPeek support for e10s if (!gMultiProcessBrowser) { diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index ddc305a7b..0a249afa9 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -53,8 +53,10 @@ titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" #endif titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" +#ifdef MOZ_PERSONAS lightweightthemes="true" lightweightthemesfooter="browser-bottombox" +#endif windowtype="navigator:browser" macanimationtype="document" screenX="4" screenY="4" diff --git a/application/palemoon/configure.in b/application/palemoon/configure.in index eb02af3c0..9d820f6d4 100644 --- a/application/palemoon/configure.in +++ b/application/palemoon/configure.in @@ -36,3 +36,16 @@ MOZ_ARG_DISABLE_BOOL(sync, MOZ_SERVICES_SYNC=, MOZ_SERVICES_SYNC=1) +dnl ======================================================== +dnl = Disable Lightweight Themes +dnl ======================================================== +MOZ_ARG_DISABLE_BOOL(personas, +[ --disable-personas Disable lightweight theme support], + MOZ_PERSONAS=, + MOZ_PERSONAS=1) + +if test -n "$MOZ_PERSONAS"; then + AC_DEFINE(MOZ_PERSONAS) +fi + +AC_SUBST(MOZ_PERSONAS) \ No newline at end of file diff --git a/application/palemoon/confvars.sh b/application/palemoon/confvars.sh index 6216cba5b..79681f013 100644 --- a/application/palemoon/confvars.sh +++ b/application/palemoon/confvars.sh @@ -46,6 +46,9 @@ MOZ_PHOENIX=1 # Browser Feature: Status bar Component MOZ_BROWSER_STATUSBAR=1 +# Lightweight Themes +MOZ_PERSONAS=1 + # Browser Feature: Profile Migration Component MOZ_PROFILE_MIGRATOR= diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index 59dc8b57b..326b2327e 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -310,6 +310,7 @@ def old_configure_options(*options): # Below are configure flags used by Pale Moon '--disable-browser-statusbar', '--disable-sync', + '--disable-personas', # Below are configure flags used by Basilisk '--disable-webextensions', -- cgit v1.2.3