]>
Commit | Line | Data |
---|---|---|
298ed8fb | 1 | diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js |
2 | --- mozilla.orig/browser/app/profile/firefox.js 2008-06-21 12:55:30.000000000 +0200 | |
3 | +++ mozilla/browser/app/profile/firefox.js 2008-06-21 15:25:48.000000000 +0200 | |
4 | @@ -89,12 +89,12 @@ | |
5 | // App-specific update preferences | |
6 | ||
7 | // Whether or not app updates are enabled | |
8 | -pref("app.update.enabled", true); | |
9 | +pref("app.update.enabled", false); | |
10 | ||
11 | // This preference turns on app.update.mode and allows automatic download and | |
12 | // install to take place. We use a separate boolean toggle for this to make | |
13 | // the UI easier to construct. | |
14 | -pref("app.update.auto", true); | |
15 | +pref("app.update.auto", false); | |
16 | ||
17 | // Defines how the Application Update Service notifies the user about updates: | |
18 | // | |
19 | @@ -186,7 +186,7 @@ | |
20 | ||
21 | // Whether or not the application should check at startup each time if it | |
22 | // is the default browser. | |
23 | -pref("browser.shell.checkDefaultBrowser", true); | |
24 | +pref("browser.shell.checkDefaultBrowser", false); | |
25 | ||
26 | // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session | |
27 | // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore | |
28 | @@ -592,10 +592,10 @@ | |
29 | ||
30 | #ifdef MOZ_SAFE_BROWSING | |
31 | // Safe browsing does nothing unless this pref is set | |
32 | -pref("browser.safebrowsing.enabled", true); | |
33 | +pref("browser.safebrowsing.enabled", false); | |
34 | ||
35 | // Prevent loading of pages identified as malware | |
36 | -pref("browser.safebrowsing.malware.enabled", true); | |
37 | +pref("browser.safebrowsing.malware.enabled", false); | |
38 | ||
39 | // Non-enhanced mode (local url lists) URL list to check for updates | |
40 | pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.1"); | |
fdede670 | 41 | @@ -739,7 +739,7 @@ |
42 | // 0 - don't pre-populate anything | |
43 | // 1 - pre-populate site URL, but don't fetch certificate | |
44 | // 2 - pre-populate site URL and pre-fetch certificate | |
45 | -pref("browser.ssl_override_behavior", 1); | |
46 | +pref("browser.ssl_override_behavior", 2); | |
47 | ||
48 | // Controls the display of domain in the identity box for SSL connections. | |
49 | // 0 - do not show domain | |
298ed8fb | 50 | diff -ur mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul |
51 | --- mozilla.orig/browser/base/content/baseMenuOverlay.xul 2008-06-21 12:55:29.000000000 +0200 | |
52 | +++ mozilla/browser/base/content/baseMenuOverlay.xul 2008-06-21 15:08:33.000000000 +0200 | |
53 | @@ -97,12 +97,6 @@ | |
54 | label="&helpReleaseNotes.label;" | |
55 | oncommand="openReleaseNotes(event)" | |
56 | onclick="checkForMiddleClick(this, event);"/> | |
57 | - <menuseparator id="updateSeparator"/> | |
58 | - <menuitem id="checkForUpdates" | |
59 | - accesskey="&updateCmd.accesskey;" | |
60 | - label="&updateCmd.label;" | |
61 | - class="menuitem-iconic" | |
62 | - oncommand="checkForUpdates();"/> | |
63 | <menuseparator id="aboutSeparator"/> | |
64 | <menuitem id="aboutName" | |
65 | accesskey="&aboutCmd.accesskey;" | |
66 | diff -ur mozilla.orig/browser/components/preferences/advanced.xul mozilla/browser/components/preferences/advanced.xul | |
67 | --- mozilla.orig/browser/components/preferences/advanced.xul 2008-06-21 12:55:30.000000000 +0200 | |
68 | +++ mozilla/browser/components/preferences/advanced.xul 2008-06-21 16:01:22.000000000 +0200 | |
69 | @@ -267,10 +267,6 @@ | |
70 | <tabpanel id="updatePanel" orient="vertical" align="start"> | |
71 | <label control="autoUpdateGroup">&autoCheck.label;</label> | |
72 | <vbox class="indent" id="autoUpdateGroup" role="group"> | |
73 | - <checkbox id="enableAppUpdate" | |
74 | - label="&enableAppUpdate.label;" | |
75 | - accesskey="&enableAppUpdate.accesskey;" | |
76 | - preference="app.update.enabled"/> | |
77 | <checkbox id="enableAddonUpdate" | |
78 | label="&enableAddonsUpdate.label;" | |
79 | accesskey="&enableAddonsUpdate.accesskey;" | |
dcb42349 | 80 | diff -ur mozilla.orig/docshell/resources/content/netError.xhtml mozilla/docshell/resources/content/netError.xhtml |
81 | --- mozilla.orig/docshell/resources/content/netError.xhtml 2008-06-21 12:55:24.000000000 +0200 | |
82 | +++ mozilla/docshell/resources/content/netError.xhtml 2008-06-22 13:08:20.000000000 +0200 | |
83 | @@ -334,8 +334,8 @@ | |
84 | <!-- Override section - For ssl errors only. Removed on init for other | |
85 | error types. --> | |
86 | <div id="securityOverrideDiv"> | |
87 | - <a id="securityOverrideLink" href="javascript:showSecuritySection();" >&securityOverride.linkText;</a> | |
88 | - <div id="securityOverrideContent" style="display: none;">&securityOverride.warningText;</div> | |
89 | + <a id="securityOverrideLink" href="javascript:showSecuritySection();" style="display: none;">&securityOverride.linkText;</a> | |
90 | + <div id="securityOverrideContent">&securityOverride.warningText;</div> | |
91 | </div> | |
92 | </div> | |
93 | ||
94 | diff -ur mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd mozilla/browser/locales/en-US/chrome/overrides/netError.dtd | |
95 | --- mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd 2008-06-21 12:55:30.000000000 +0200 | |
96 | +++ mozilla/browser/locales/en-US/chrome/overrides/netError.dtd 2008-06-22 13:52:26.000000000 +0200 | |
97 | @@ -175,6 +175,6 @@ | |
98 | <!ENTITY securityOverride.warningText " | |
99 | <p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p> | |
100 | ||
101 | -<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/> | |
102 | <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/> | |
103 | +<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/> | |
104 | "> |