зеркало из https://github.com/mozilla/pjs.git
Bug 443918: Don't show (and force user to accept) EULA for
open-source builds. r=gavin.sharp, sr=mconnor
This commit is contained in:
Родитель
bc4f01745d
Коммит
a0913ff2d7
|
@ -180,7 +180,7 @@ BrowserGlue.prototype = {
|
||||||
// Global override for tinderbox machines
|
// Global override for tinderbox machines
|
||||||
var prefBranch = Cc["@mozilla.org/preferences-service;1"].
|
var prefBranch = Cc["@mozilla.org/preferences-service;1"].
|
||||||
getService(Ci.nsIPrefBranch);
|
getService(Ci.nsIPrefBranch);
|
||||||
var mustDisplayEULA = true;
|
var mustDisplayEULA = false;
|
||||||
try {
|
try {
|
||||||
mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
|
mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|
|
@ -13,3 +13,5 @@ pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VER
|
||||||
pref("browser.search.param.yahoo-fr", "moz2");
|
pref("browser.search.param.yahoo-fr", "moz2");
|
||||||
pref("browser.search.param.yahoo-fr-cjkt", "moz2");
|
pref("browser.search.param.yahoo-fr-cjkt", "moz2");
|
||||||
pref("browser.search.param.yahoo-f-CN", "D3_g");
|
pref("browser.search.param.yahoo-f-CN", "D3_g");
|
||||||
|
|
||||||
|
pref("browser.EULA.override", false); // false = Do show EULA on first start
|
||||||
|
|
Загрузка…
Ссылка в новой задаче