Bug 443918: Don't show (and force user to accept) EULA for
open-source builds. r=gavin.sharp, sr=mconnor
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -175,17 +175,17 @@ BrowserGlue.prototype = {
// profile startup handler (contains profile initialization routines)
_onProfileStartup: function()
{
// Check to see if the EULA must be shown on startup
// Global override for tinderbox machines
var prefBranch = Cc["@mozilla.org/preferences-service;1"].
getService(Ci.nsIPrefBranch);
- var mustDisplayEULA = true;
+ var mustDisplayEULA = false;
try {
mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
} catch (e) {
// Pref might not exist
}
// Make sure it hasn't already been accepted
if (mustDisplayEULA) {
--- a/other-licenses/branding/firefox/pref/firefox-branding.js
+++ b/other-licenses/branding/firefox/pref/firefox-branding.js
@@ -8,8 +8,10 @@ pref("app.update.url.manual", "http://%L
pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/releases/");
// Release notes URL
pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
pref("browser.search.param.yahoo-fr", "moz2");
pref("browser.search.param.yahoo-fr-cjkt", "moz2");
pref("browser.search.param.yahoo-f-CN", "D3_g");
+
+pref("browser.EULA.override", false); // false = Do show EULA on first start