|
 |
e48ead5 |
diff -up mozilla/browser/base/jar.mn.firstrun mozilla/browser/base/jar.mn
|
|
|
e48ead5 |
--- mozilla/browser/base/jar.mn.firstrun 2008-06-15 12:39:28.000000000 -0700
|
|
|
e48ead5 |
+++ mozilla/browser/base/jar.mn 2008-06-15 12:39:34.000000000 -0700
|
|
|
e48ead5 |
@@ -21,9 +21,6 @@ browser.jar:
|
|
|
e48ead5 |
* content/browser/browser.js (content/browser.js)
|
|
|
e48ead5 |
* content/browser/browser.xul (content/browser.xul)
|
|
|
e48ead5 |
* content/browser/credits.xhtml (content/credits.xhtml)
|
|
|
e48ead5 |
-* content/browser/EULA.js (content/EULA.js)
|
|
|
e48ead5 |
-* content/browser/EULA.xhtml (content/EULA.xhtml)
|
|
|
e48ead5 |
-* content/browser/EULA.xul (content/EULA.xul)
|
|
|
e48ead5 |
* content/browser/metaData.js (content/metaData.js)
|
|
|
e48ead5 |
* content/browser/metaData.xul (content/metaData.xul)
|
|
|
e48ead5 |
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
|
|
|
e48ead5 |
diff -up mozilla/browser/components/nsBrowserGlue.js.firstrun mozilla/browser/components/nsBrowserGlue.js
|
|
|
e48ead5 |
--- mozilla/browser/components/nsBrowserGlue.js.firstrun 2008-06-15 11:28:29.000000000 -0700
|
|
|
e48ead5 |
+++ mozilla/browser/components/nsBrowserGlue.js 2008-06-15 11:28:36.000000000 -0700
|
|
|
e48ead5 |
@@ -175,34 +175,6 @@ BrowserGlue.prototype = {
|
|
|
e48ead5 |
// profile startup handler (contains profile initialization routines)
|
|
|
e48ead5 |
_onProfileStartup: function()
|
|
|
e48ead5 |
{
|
|
|
e48ead5 |
- // Check to see if the EULA must be shown on startup
|
|
|
e48ead5 |
-
|
|
|
e48ead5 |
- // Global override for tinderbox machines
|
|
|
e48ead5 |
- var prefBranch = Cc["@mozilla.org/preferences-service;1"].
|
|
|
e48ead5 |
- getService(Ci.nsIPrefBranch);
|
|
|
e48ead5 |
- var mustDisplayEULA = true;
|
|
|
e48ead5 |
- try {
|
|
|
e48ead5 |
- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
|
|
|
e48ead5 |
- } catch (e) {
|
|
|
e48ead5 |
- // Pref might not exist
|
|
|
e48ead5 |
- }
|
|
|
e48ead5 |
-
|
|
|
e48ead5 |
- // Make sure it hasn't already been accepted
|
|
|
e48ead5 |
- if (mustDisplayEULA) {
|
|
|
e48ead5 |
- try {
|
|
|
e48ead5 |
- var EULAVersion = prefBranch.getIntPref("browser.EULA.version");
|
|
|
e48ead5 |
- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA." + EULAVersion + ".accepted");
|
|
|
e48ead5 |
- } catch(ex) {
|
|
|
e48ead5 |
- }
|
|
|
e48ead5 |
- }
|
|
|
e48ead5 |
-
|
|
|
e48ead5 |
- if (mustDisplayEULA) {
|
|
|
e48ead5 |
- var ww2 = Cc["@mozilla.org/embedcomp/window-watcher;1"].
|
|
|
e48ead5 |
- getService(Ci.nsIWindowWatcher);
|
|
|
e48ead5 |
- ww2.openWindow(null, "chrome://browser/content/EULA.xul",
|
|
|
e48ead5 |
- "_blank", "chrome,centerscreen,modal,resizable=yes", null);
|
|
|
e48ead5 |
- }
|
|
|
e48ead5 |
-
|
|
|
e48ead5 |
this.Sanitizer.onStartup();
|
|
|
e48ead5 |
// check if we're in safe mode
|
|
|
e48ead5 |
var app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).
|