Bug 443918: Don't show (and force user to accept) EULA for
authorBen Bucksch <mozilla@bucksch.org>
Tue, 16 Sep 2008 03:16:19 +0200
changeset 19280 da539de11534af7950027f741ddc72d4afa7496e
parent 19279 78c6d65de4966731a98c4106e1703178fd5dfc8f
child 19281 6ef3bf360f6c8b5390d49f52bfa370094e194f2b
push id2087
push usermozilla.BenB@bucksch.org
push dateTue, 16 Sep 2008 01:15:32 +0000
treeherdermozilla-central@da539de11534 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs443918
milestone1.9.1b1pre
Bug 443918: Don't show (and force user to accept) EULA for open-source builds. r=gavin.sharp, sr=mconnor
browser/components/nsBrowserGlue.js
other-licenses/branding/firefox/pref/firefox-branding.js
--- 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