diff options
17 files changed, 26 insertions, 14 deletions
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js index 633cb8853..c4cd87f60 100644 --- a/application/palemoon/base/content/utilityOverlay.js +++ b/application/palemoon/base/content/utilityOverlay.js @@ -9,6 +9,9 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm"); Components.utils.import("resource:///modules/RecentWindow.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "ShellService", + "resource:///modules/ShellService.jsm"); + XPCOMUtils.defineLazyGetter(this, "BROWSER_NEW_TAB_URL", function () { const PREF = "browser.newtab.url"; @@ -448,15 +451,10 @@ function gatherTextUnder ( root ) return text; } +// This function exists for legacy reasons. function getShellService() { - var shell = null; - try { - shell = Components.classes["@mozilla.org/browser/shell-service;1"] - .getService(Components.interfaces.nsIShellService); - } catch (e) { - } - return shell; + return ShellService; } function isBidiEnabled() { diff --git a/application/palemoon/branding/unstable/pref/palemoon-branding.js b/application/palemoon/branding/unstable/pref/palemoon-branding.js index dda6f86a5..a95390cb6 100644 --- a/application/palemoon/branding/unstable/pref/palemoon-branding.js +++ b/application/palemoon/branding/unstable/pref/palemoon-branding.js @@ -12,7 +12,7 @@ pref("general.useragent.compatMode.gecko", true); pref("general.useragent.compatMode.firefox", true);
// ========================= updates ========================
-#if defined(XP_WIN)
+#if defined(XP_WIN) || defined(XP_LINUX)
// Enable auto-updates for this channel
pref("app.update.auto", true);
@@ -32,7 +32,7 @@ pref("app.update.url.manual", "http://www.palemoon.org/unstable/"); // supplied in the "An update is available" page of the update wizard.
pref("app.update.url.details", "http://www.palemoon.org/unstable/");
#else
-// Updates disabled (Linux, etc.)
+// Updates disabled (Mac, etc.)
pref("app.update.enabled", false);
pref("app.update.url", "");
#endif
diff --git a/browser/base/content/browser-safebrowsing.js b/browser/base/content/browser-safebrowsing.js index a66595b2d..430d84f13 100644 --- a/browser/base/content/browser-safebrowsing.js +++ b/browser/base/content/browser-safebrowsing.js @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifdef MOZ_SAFE_BROWSING var gSafeBrowsing = { setReportPhishingMenu: function() { @@ -47,4 +46,3 @@ var gSafeBrowsing = { return SafeBrowsing.getReportURL(name, gBrowser.currentURI); } } -#endif diff --git a/browser/components/preferences/blocklists.js b/browser/components/preferences/blocklists.js index c0ce5b656..bc39eb6bd 100644 --- a/browser/components/preferences/blocklists.js +++ b/browser/components/preferences/blocklists.js @@ -6,11 +6,9 @@ Components.utils.import("resource://gre/modules/Services.jsm"); const BASE_LIST_ID = "base"; const CONTENT_LIST_ID = "content"; const TRACK_SUFFIX = "-track-digest256"; -#ifdef MOZ_SAFE_BROWSING const TRACKING_TABLE_PREF = "urlclassifier.trackingTable"; const LISTS_PREF_BRANCH = "browser.safebrowsing.provider.mozilla.lists."; const UPDATE_TIME_PREF = "browser.safebrowsing.provider.mozilla.nextupdatetime"; -#endif var gBlocklistManager = { _type: "", diff --git a/browser/themes/linux/social/services-16.png b/browser/themes/linux/social/services-16.png Binary files differdeleted file mode 100644 index 7001ea1f0..000000000 --- a/browser/themes/linux/social/services-16.png +++ /dev/null diff --git a/browser/themes/linux/social/services-64.png b/browser/themes/linux/social/services-64.png Binary files differdeleted file mode 100644 index e787bddc3..000000000 --- a/browser/themes/linux/social/services-64.png +++ /dev/null diff --git a/browser/themes/linux/social/share-button-active.png b/browser/themes/linux/social/share-button-active.png Binary files differdeleted file mode 100644 index 7df438db0..000000000 --- a/browser/themes/linux/social/share-button-active.png +++ /dev/null diff --git a/browser/themes/linux/social/share-button.png b/browser/themes/linux/social/share-button.png Binary files differdeleted file mode 100644 index c5298c143..000000000 --- a/browser/themes/linux/social/share-button.png +++ /dev/null diff --git a/browser/themes/osx/social/services-16.png b/browser/themes/osx/social/services-16.png Binary files differdeleted file mode 100644 index 7001ea1f0..000000000 --- a/browser/themes/osx/social/services-16.png +++ /dev/null diff --git a/browser/themes/osx/social/services-16@2x.png b/browser/themes/osx/social/services-16@2x.png Binary files differdeleted file mode 100644 index 019110ce2..000000000 --- a/browser/themes/osx/social/services-16@2x.png +++ /dev/null diff --git a/browser/themes/osx/social/services-64.png b/browser/themes/osx/social/services-64.png Binary files differdeleted file mode 100644 index e787bddc3..000000000 --- a/browser/themes/osx/social/services-64.png +++ /dev/null diff --git a/browser/themes/osx/social/services-64@2x.png b/browser/themes/osx/social/services-64@2x.png Binary files differdeleted file mode 100644 index e252b80bc..000000000 --- a/browser/themes/osx/social/services-64@2x.png +++ /dev/null diff --git a/browser/themes/windows/social/services-16.png b/browser/themes/windows/social/services-16.png Binary files differdeleted file mode 100644 index a5f40b21d..000000000 --- a/browser/themes/windows/social/services-16.png +++ /dev/null diff --git a/browser/themes/windows/social/services-64.png b/browser/themes/windows/social/services-64.png Binary files differdeleted file mode 100644 index c42c27826..000000000 --- a/browser/themes/windows/social/services-64.png +++ /dev/null diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index c1ad71d5f..20bde1eee 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -213,6 +213,7 @@ def old_configure_options(*options): '--enable-pie', '--enable-png-arm-neon-support', '--enable-posix-nspr-emulation', + '--enable-precompiled-startupcache', '--enable-pref-extensions', '--enable-private-build', '--enable-pulseaudio', diff --git a/old-configure.in b/old-configure.in index 13f6915b4..120abdf8a 100644 --- a/old-configure.in +++ b/old-configure.in @@ -4340,6 +4340,22 @@ MOZ_ARG_ENABLE_BOOL(debug-js-modules, AC_SUBST(DEBUG_JS_MODULES) dnl ======================================================== +dnl = Don't precompile the startup cache +dnl ======================================================== +MOZ_DISABLE_PRECOMPILED_STARTUPCACHE= + +MOZ_ARG_DISABLE_BOOL(precompiled-startupcache, +[ --disable-precompiled-startupcache Don't precompile the startup cache ], + MOZ_DISABLE_PRECOMPILED_STARTUPCACHE=1, + MOZ_DISABLE_PRECOMPILED_STARTUPCACHE= ) + +if test -n "$MOZ_DISABLE_PRECOMPILED_STARTUPCACHE"; then + AC_DEFINE(MOZ_DISABLE_PRECOMPILED_STARTUPCACHE) +fi + +AC_SUBST(MOZ_DISABLE_PRECOMPILED_STARTUPCACHE) + +dnl ======================================================== dnl = dnl = Profiling and Instrumenting dnl = diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py index f2dc3fac6..1a144823c 100644 --- a/toolkit/mozapps/installer/packager.py +++ b/toolkit/mozapps/installer/packager.py @@ -391,7 +391,8 @@ def main(): # Fill startup cache if isinstance(formatter, OmniJarFormatter) and launcher.can_launch() \ - and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1': + and buildconfig.substs['MOZ_DISABLE_STARTUPCACHE'] != '1' \ + and buildconfig.substs['MOZ_DISABLE_PRECOMPILED_STARTUPCACHE'] != '1': gre_path = None def get_bases(): for b in sink.packager.get_bases(addons=False): |
