diff options
33 files changed, 97 insertions, 47 deletions
@@ -22,4 +22,4 @@ # changes to stick? As of bug 928195, this shouldn't be necessary! Please # don't change CLOBBER for WebIDL changes any more. -Clobber for updating ffvpx +Clobber for updating NSPR+NSS diff --git a/application/basilisk/components/preferences/in-content/privacy.js b/application/basilisk/components/preferences/in-content/privacy.js index fced02fe6..eab606e36 100644 --- a/application/basilisk/components/preferences/in-content/privacy.js +++ b/application/basilisk/components/preferences/in-content/privacy.js @@ -22,7 +22,7 @@ var gPrivacyPane = { */ _shouldPromptForRestart: true, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING /** * Show the Tracking Protection UI depending on the * privacy.trackingprotection.ui.enabled pref, and linkify its Learn More link @@ -131,7 +131,7 @@ var gPrivacyPane = { this.updateHistoryModePane(); this.updatePrivacyMicroControls(); this.initAutoStartPrivateBrowsingReverter(); -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING this._initTrackingProtection(); this._initTrackingProtectionPBM(); #endif @@ -160,7 +160,7 @@ var gPrivacyPane = { gPrivacyPane.clearPrivateDataNow(true); return false; }); -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING setEventListener("doNotTrackSettings", "click", function () { gPrivacyPane.showDoNotTrackSettings(); return false; @@ -174,7 +174,7 @@ var gPrivacyPane = { gPrivacyPane.showCookies); setEventListener("clearDataSettings", "command", gPrivacyPane.showClearPrivateDataSettings); -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING setEventListener("trackingProtectionRadioGroup", "command", gPrivacyPane.trackingProtectionWritePrefs); setEventListener("trackingProtectionExceptions", "command", @@ -190,7 +190,7 @@ var gPrivacyPane = { gPrivacyPane.showContainerSettings); }, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING // TRACKING PROTECTION MODE /** @@ -472,7 +472,7 @@ var gPrivacyPane = { this._shouldPromptForRestart = true; }, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING /** * Displays fine-grained, per-site preferences for tracking protection. */ @@ -496,7 +496,7 @@ var gPrivacyPane = { gotoPref("containers"); }, -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING /** * Displays the available block lists for tracking protection. */ diff --git a/application/basilisk/components/preferences/in-content/privacy.xul b/application/basilisk/components/preferences/in-content/privacy.xul index 8881a84fe..e6cdc5dd2 100644 --- a/application/basilisk/components/preferences/in-content/privacy.xul +++ b/application/basilisk/components/preferences/in-content/privacy.xul @@ -10,7 +10,7 @@ <preferences id="privacyPreferences" hidden="true" data-category="panePrivacy"> <!-- Tracking --> -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING <preference id="privacy.trackingprotection.enabled" name="privacy.trackingprotection.enabled" type="bool"/> @@ -91,7 +91,7 @@ <!-- Tracking --> <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true"> -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING <vbox id="trackingprotectionbox" hidden="true"> <hbox align="start"> <vbox> diff --git a/application/basilisk/components/preferences/jar.mn b/application/basilisk/components/preferences/jar.mn index b25fc89b8..d233c7865 100644 --- a/application/basilisk/components/preferences/jar.mn +++ b/application/basilisk/components/preferences/jar.mn @@ -5,7 +5,7 @@ browser.jar: content/browser/preferences/applicationManager.xul content/browser/preferences/applicationManager.js -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING content/browser/preferences/blocklists.xul content/browser/preferences/blocklists.js #endif @@ -14,7 +14,7 @@ browser.jar: content/browser/preferences/cookies.js * content/browser/preferences/connection.xul content/browser/preferences/connection.js -#ifdef MOZ_SAFEBROWSING +#ifdef MOZ_SAFE_BROWSING content/browser/preferences/donottrack.xul #endif * content/browser/preferences/fonts.xul diff --git a/application/palemoon/base/content/aboutDialog.css b/application/palemoon/base/content/aboutDialog.css index aa79b0795..d171a0bc1 100644 --- a/application/palemoon/base/content/aboutDialog.css +++ b/application/palemoon/base/content/aboutDialog.css @@ -25,9 +25,6 @@ #PMversion { margin-top: 10px; -moz-margin-start: 0; - -moz-user-select: text; - -moz-user-focus: normal; - cursor: text; } #distribution, diff --git a/application/palemoon/components/about/AboutRedirector.cpp b/application/palemoon/components/about/AboutRedirector.cpp index 27f6540b2..12143b399 100644 --- a/application/palemoon/components/about/AboutRedirector.cpp +++ b/application/palemoon/components/about/AboutRedirector.cpp @@ -62,7 +62,7 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT }, { - "permissions", "chrome://browser/content/preferences/aboutPermissions.xul", + "permissions", "chrome://browser/content/permissions/aboutPermissions.xul", nsIAboutModule::ALLOW_SCRIPT }, { diff --git a/application/palemoon/components/moz.build b/application/palemoon/components/moz.build index 6e83936a9..397bf5142 100644 --- a/application/palemoon/components/moz.build +++ b/application/palemoon/components/moz.build @@ -12,6 +12,7 @@ DIRS += [ 'feeds', 'fuel', 'places', + 'permissions', 'preferences', 'privatebrowsing', 'search', diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js index 5910ae9c0..720d1165c 100644 --- a/application/palemoon/components/nsBrowserGlue.js +++ b/application/palemoon/components/nsBrowserGlue.js @@ -1207,7 +1207,7 @@ BrowserGlue.prototype = { }, _migrateUI: function BG__migrateUI() { - const UI_VERSION = 18; + const UI_VERSION = 19; const BROWSER_DOCURL = "chrome://browser/content/browser.xul#"; let currentUIVersion = 0; try { @@ -1426,6 +1426,22 @@ BrowserGlue.prototype = { catch (ex) {} } +#ifndef MOZ_JXR + // Until JPEG-XR decoder is implemented (UXP #144) + if (currentUIVersion < 19) { + try { + let ihaPref = "image.http.accept"; + let ihaValue = Services.prefs.getCharPref(ihaPref); + if (ihaValue.includes("image/jxr,")) { + Services.prefs.setCharPref(ihaPref, ihaValue.replace("image/jxr,", "")); + } else if (ihaValue.includes("image/jxr")) { + Services.prefs.clearUserPref(ihaPref); + } + } + catch (ex) {} + } +#endif + // Update the migration version. Services.prefs.setIntPref("browser.migration.version", UI_VERSION); }, diff --git a/application/palemoon/components/preferences/aboutPermissions.css b/application/palemoon/components/permissions/aboutPermissions.css index cec82a030..d73b6a879 100644 --- a/application/palemoon/components/preferences/aboutPermissions.css +++ b/application/palemoon/components/permissions/aboutPermissions.css @@ -3,9 +3,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ .site { - -moz-binding: url("chrome://browser/content/preferences/aboutPermissions.xml#site"); + -moz-binding: url("chrome://browser/content/permissions/aboutPermissions.xml#site"); } .pluginPermission { - -moz-binding: url("chrome://browser/content/preferences/aboutPermissions.xml#pluginPermission"); + -moz-binding: url("chrome://browser/content/permissions/aboutPermissions.xml#pluginPermission"); } diff --git a/application/palemoon/components/preferences/aboutPermissions.js b/application/palemoon/components/permissions/aboutPermissions.js index 9fb12d081..6aaacf11d 100644 --- a/application/palemoon/components/preferences/aboutPermissions.js +++ b/application/palemoon/components/permissions/aboutPermissions.js @@ -480,7 +480,7 @@ var AboutPermissions = { .createBundle("chrome://browser/locale/browser.properties"), _stringBundleAboutPermissions: Services.strings.createBundle( - "chrome://browser/locale/preferences/aboutPermissions.properties"), + "chrome://browser/locale/permissions/aboutPermissions.properties"), _initPart1: function() { this.initPluginList(); diff --git a/application/palemoon/components/preferences/aboutPermissions.xml b/application/palemoon/components/permissions/aboutPermissions.xml index 4df0d964d..2932ea08c 100644 --- a/application/palemoon/components/preferences/aboutPermissions.xml +++ b/application/palemoon/components/permissions/aboutPermissions.xml @@ -4,7 +4,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <!DOCTYPE bindings [ -<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/preferences/aboutPermissions.dtd" > +<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/permissions/aboutPermissions.dtd" > %aboutPermissionsDTD; ]> diff --git a/application/palemoon/components/preferences/aboutPermissions.xul b/application/palemoon/components/permissions/aboutPermissions.xul index 56d6cfbbf..23c1dd861 100644 --- a/application/palemoon/components/preferences/aboutPermissions.xul +++ b/application/palemoon/components/permissions/aboutPermissions.xul @@ -4,13 +4,13 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://browser/content/preferences/aboutPermissions.css"?> -<?xml-stylesheet href="chrome://browser/skin/preferences/aboutPermissions.css"?> +<?xml-stylesheet href="chrome://browser/content/permissions/aboutPermissions.css"?> +<?xml-stylesheet href="chrome://browser/skin/permissions/aboutPermissions.css"?> <!DOCTYPE page [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; -<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/preferences/aboutPermissions.dtd" > +<!ENTITY % aboutPermissionsDTD SYSTEM "chrome://browser/locale/permissions/aboutPermissions.dtd" > %aboutPermissionsDTD; ]> @@ -23,7 +23,7 @@ role="application"> <script type="application/javascript" - src="chrome://browser/content/preferences/aboutPermissions.js"/> + src="chrome://browser/content/permissions/aboutPermissions.js"/> <keyset> <key key="&focusSearch.key;" modifiers="accel" oncommand="AboutPermissions.focusFilterBox();"/> diff --git a/application/palemoon/components/permissions/jar.mn b/application/palemoon/components/permissions/jar.mn new file mode 100644 index 000000000..53fb2b41e --- /dev/null +++ b/application/palemoon/components/permissions/jar.mn @@ -0,0 +1,9 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + +browser.jar: + content/browser/permissions/aboutPermissions.xul + content/browser/permissions/aboutPermissions.js + content/browser/permissions/aboutPermissions.css + content/browser/permissions/aboutPermissions.xml diff --git a/application/palemoon/components/permissions/moz.build b/application/palemoon/components/permissions/moz.build new file mode 100644 index 000000000..a4c26de89 --- /dev/null +++ b/application/palemoon/components/permissions/moz.build @@ -0,0 +1,8 @@ +# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. + + +JAR_MANIFESTS += ['jar.mn'] diff --git a/application/palemoon/components/preferences/jar.mn b/application/palemoon/components/preferences/jar.mn index 798a2dae4..2e2949306 100644 --- a/application/palemoon/components/preferences/jar.mn +++ b/application/palemoon/components/preferences/jar.mn @@ -3,10 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. browser.jar: - content/browser/preferences/aboutPermissions.xul - content/browser/preferences/aboutPermissions.js - content/browser/preferences/aboutPermissions.css - content/browser/preferences/aboutPermissions.xml * content/browser/preferences/advanced.xul * content/browser/preferences/advanced.js content/browser/preferences/applications.xul diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd index 14412607a..14412607a 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.dtd diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.properties b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.properties index ca90a6cfb..ca90a6cfb 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/aboutPermissions.properties +++ b/application/palemoon/locales/en-US/chrome/browser/permissions/aboutPermissions.properties diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn index f2b9ddeb2..046cb0ac7 100644 --- a/application/palemoon/locales/jar.mn +++ b/application/palemoon/locales/jar.mn @@ -55,8 +55,8 @@ locale/browser/places/moveBookmarks.dtd (%chrome/browser/places/moveBookmarks.dtd) locale/browser/feeds/subscribe.dtd (%chrome/browser/feeds/subscribe.dtd) locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) - locale/browser/preferences/aboutPermissions.dtd (%chrome/browser/preferences/aboutPermissions.dtd) - locale/browser/preferences/aboutPermissions.properties (%chrome/browser/preferences/aboutPermissions.properties) + locale/browser/permissions/aboutPermissions.dtd (%chrome/browser/permissions/aboutPermissions.dtd) + locale/browser/permissions/aboutPermissions.properties (%chrome/browser/permissions/aboutPermissions.properties) locale/browser/preferences/advanced.dtd (%chrome/browser/preferences/advanced.dtd) locale/browser/preferences/applicationManager.dtd (%chrome/browser/preferences/applicationManager.dtd) locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties) diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn index 570bbb153..ec638f54c 100644 --- a/application/palemoon/themes/linux/jar.mn +++ b/application/palemoon/themes/linux/jar.mn @@ -97,6 +97,7 @@ browser.jar: skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png) skin/classic/browser/places/downloads.png (places/downloads.png) + skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css) skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) skin/classic/browser/preferences/mail.png (preferences/mail.png) skin/classic/browser/preferences/Options.png (preferences/Options.png) @@ -105,7 +106,6 @@ browser.jar: #endif * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) #ifdef MOZ_BROWSER_STATUSBAR skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css) * skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css) diff --git a/application/palemoon/themes/linux/preferences/aboutPermissions.css b/application/palemoon/themes/linux/permissions/aboutPermissions.css index 2ad833fb2..2ad833fb2 100644 --- a/application/palemoon/themes/linux/preferences/aboutPermissions.css +++ b/application/palemoon/themes/linux/permissions/aboutPermissions.css diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn index 28d779985..17d0637f7 100644 --- a/application/palemoon/themes/osx/jar.mn +++ b/application/palemoon/themes/osx/jar.mn @@ -123,6 +123,7 @@ browser.jar: skin/classic/browser/places/livemark-item.png (places/livemark-item.png) skin/classic/browser/places/expander-closed.png (places/expander-closed.png) skin/classic/browser/places/expander-open.png (places/expander-open.png) + skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css) skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) skin/classic/browser/preferences/application.png (preferences/application.png) skin/classic/browser/preferences/mail.png (preferences/mail.png) @@ -133,7 +134,6 @@ browser.jar: skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) #ifdef MOZ_BROWSER_STATUSBAR skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css) * skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css) diff --git a/application/palemoon/themes/osx/preferences/aboutPermissions.css b/application/palemoon/themes/osx/permissions/aboutPermissions.css index de636f5c4..de636f5c4 100644 --- a/application/palemoon/themes/osx/preferences/aboutPermissions.css +++ b/application/palemoon/themes/osx/permissions/aboutPermissions.css diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn index ce4627e21..b660ba296 100644 --- a/application/palemoon/themes/windows/jar.mn +++ b/application/palemoon/themes/windows/jar.mn @@ -117,6 +117,7 @@ browser.jar: skin/classic/browser/places/unsortedBookmarks.png (places/unsortedBookmarks.png) skin/classic/browser/places/downloads.png (places/downloads.png) skin/classic/browser/places/livemark-item.png (places/livemark-item.png) + skin/classic/browser/permissions/aboutPermissions.css (permissions/aboutPermissions.css) skin/classic/browser/preferences/alwaysAsk.png (preferences/alwaysAsk.png) skin/classic/browser/preferences/application.png (preferences/application.png) skin/classic/browser/preferences/mail.png (preferences/mail.png) @@ -127,7 +128,6 @@ browser.jar: skin/classic/browser/preferences/saveFile.png (preferences/saveFile.png) * skin/classic/browser/preferences/preferences.css (preferences/preferences.css) skin/classic/browser/preferences/applications.css (preferences/applications.css) - skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) #ifdef MOZ_BROWSER_STATUSBAR skin/classic/browser/statusbar/dynamic.css (../shared/statusbar/dynamic.css) * skin/classic/browser/statusbar/overlay.css (statusbar/overlay.css) diff --git a/application/palemoon/themes/windows/preferences/aboutPermissions.css b/application/palemoon/themes/windows/permissions/aboutPermissions.css index c985150de..c985150de 100644 --- a/application/palemoon/themes/windows/preferences/aboutPermissions.css +++ b/application/palemoon/themes/windows/permissions/aboutPermissions.css diff --git a/dom/bindings/DOMJSProxyHandler.cpp b/dom/bindings/DOMJSProxyHandler.cpp index 65e540bc1..23f0abd88 100644 --- a/dom/bindings/DOMJSProxyHandler.cpp +++ b/dom/bindings/DOMJSProxyHandler.cpp @@ -166,6 +166,10 @@ DOMProxyHandler::EnsureExpandoObject(JSContext* cx, JS::Handle<JSObject*> obj) nsISupports* native = UnwrapDOMObject<nsISupports>(obj); nsWrapperCache* cache; CallQueryInterface(native, &cache); + if (!cache) { + return expando; + } + if (expandoAndGeneration) { cache->PreserveWrapper(native); expandoAndGeneration->expando.setObject(*expando); diff --git a/image/decoders/nsWebPDecoder.cpp b/image/decoders/nsWebPDecoder.cpp index 5da696347..6ed2c3e9c 100644 --- a/image/decoders/nsWebPDecoder.cpp +++ b/image/decoders/nsWebPDecoder.cpp @@ -119,6 +119,7 @@ nsWebPDecoder::EndFrame() mTimeout.AsEncodedValueDeprecated(), (int)mBlend)); PostFrameStop(opacity, mDisposal, mTimeout, mBlend); + WebPFreeDecBuffer(&mBuffer); WebPIDelete(mDecoder); mDecoder = nullptr; mLastRow = 0; diff --git a/intl/hyphenation/glue/hnjstdio.cpp b/intl/hyphenation/glue/hnjstdio.cpp index 5be8b7c1d..59ecdf775 100644 --- a/intl/hyphenation/glue/hnjstdio.cpp +++ b/intl/hyphenation/glue/hnjstdio.cpp @@ -137,4 +137,4 @@ int hnjFeof(hnjFile* f) { return f->mEOF ? EOF : 0; -}
\ No newline at end of file +} diff --git a/toolkit/content/about.js b/toolkit/content/about.js index c27916c10..c402ea685 100644 --- a/toolkit/content/about.js +++ b/toolkit/content/about.js @@ -33,7 +33,12 @@ var versionNum = Components.classes["@mozilla.org/xre/app-info;1"] .getService(Components.interfaces.nsIXULAppInfo) .version; var version = document.getElementById("version"); -version.textContent += " " + versionNum; +#ifdef HAVE_64BIT_BUILD +var versionStr = versionNum + " (64-bit)"; +#else +var versionStr = versionNum + " (32-bit)"; +#endif +version.textContent += " " + versionStr; // insert the buildid of the XUL application var BuildIDVal = Components.classes["@mozilla.org/xre/app-info;1"] diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 7209b7ad0..016549f43 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -42,6 +42,9 @@ var snapshotFormatters = { $("os-box").textContent = data.osVersion; $("supportLink").href = data.supportURL; let version = AppConstants.MOZ_APP_VERSION_DISPLAY; + if (data.versionArch) { + version += " (" + data.versionArch + ")"; + } if (data.vendor) version += " (" + data.vendor + ")"; $("version-box").textContent = version; diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 72a7952c4..a5db7e3a1 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -8,7 +8,7 @@ toolkit.jar: content/global/textbox.css content/global/menulist.css content/global/autocomplete.css - content/global/about.js +* content/global/about.js content/global/about.xhtml content/global/aboutAbout.js content/global/aboutAbout.xhtml diff --git a/toolkit/locales/en-US/chrome/global/about.dtd b/toolkit/locales/en-US/chrome/global/about.dtd index 85c1a6d25..5de3837ad 100644 --- a/toolkit/locales/en-US/chrome/global/about.dtd +++ b/toolkit/locales/en-US/chrome/global/about.dtd @@ -1,7 +1,7 @@ <!-- This Source Code Form is subject to the terms of the Mozilla Public - 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/. --> -<!ENTITY about.version "Version"> +<!ENTITY about.version "Version:"> <!-- LOCALIZATION NOTE (about.credits.beforeLink): note that there is no space between this phrase and the linked about.credits.linkTitle phrase, so if your locale needs a space between words, add it at the end of this entity. --> <!ENTITY about.credits.beforeLink "See a list of "> diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index 42f3fb809..20aad6770 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -10,7 +10,6 @@ const { classes: Cc, interfaces: Ci, utils: Cu } = Components; Cu.import("resource://gre/modules/AddonManager.jsm"); Cu.import("resource://gre/modules/Services.jsm"); -Cu.import("resource://gre/modules/AppConstants.jsm"); // We use a preferences whitelist to make sure we only show preferences that // are useful for support and won't compromise the user's privacy. Note that @@ -177,16 +176,23 @@ var dataProviders = { let data = { name: Services.appinfo.name, osVersion: sysInfo.getProperty("name") + " " + sysInfo.getProperty("version"), - version: AppConstants.MOZ_APP_VERSION_DISPLAY, buildID: Services.appinfo.appBuildID, userAgent: Cc["@mozilla.org/network/protocol;1?name=http"]. getService(Ci.nsIHttpProtocolHandler). userAgent, safeMode: Services.appinfo.inSafeMode, }; +#expand data.version = "__MOZ_APP_VERSION_DISPLAY__"; - if (AppConstants.MOZ_UPDATER) - data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel; +#ifdef MOZ_UPDATER + data.updateChannel = Cu.import("resource://gre/modules/UpdateUtils.jsm", {}).UpdateUtils.UpdateChannel; +#endif + +#ifdef HAVE_64BIT_BUILD + data.versionArch = "64-bit"; +#else + data.versionArch = "32-bit"; +#endif try { data.vendor = Services.prefs.getCharPref("app.support.vendor"); @@ -350,9 +356,11 @@ var dataProviders = { data.currentAudioBackend = winUtils.currentAudioBackend; if (!data.numAcceleratedWindows && gfxInfo) { - let win = AppConstants.platform == "win"; - let feature = win ? gfxInfo.FEATURE_DIRECT3D_9_LAYERS : - gfxInfo.FEATURE_OPENGL_LAYERS; +#ifdef XP_WIN + let feature = gfxInfo.FEATURE_DIRECT3D_9_LAYERS; +#else + let feature = gfxInfo.FEATURE_OPENGL_LAYERS; +#endif data.numAcceleratedWindowsMessage = statusMsgForFeature(feature); } diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 60f3cc3da..e288d11c8 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -94,7 +94,6 @@ EXTRA_JS_MODULES += [ 'Sqlite.jsm', 'Task.jsm', 'Timer.jsm', - 'Troubleshoot.jsm', 'UpdateUtils.jsm', 'WebChannel.jsm', 'WindowDraggingUtils.jsm', @@ -103,7 +102,10 @@ EXTRA_JS_MODULES += [ EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js'] EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] -EXTRA_PP_JS_MODULES += ['NewTabUtils.jsm'] +EXTRA_PP_JS_MODULES += [ + 'NewTabUtils.jsm', + 'Troubleshoot.jsm', +] if not CONFIG['MOZ_WEBEXTENSIONS']: EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm'] |