Author: paszczus Date: Fri Jun 5 13:19:42 2009 GMT Module: packages Tag: DEVEL ---- Log message: - updated for 3.5b4
---- Files affected: packages/mozilla-firefox: mozilla-firefox-prefs.patch (1.4 -> 1.4.2.1) ---- Diffs: ================================================================ Index: packages/mozilla-firefox/mozilla-firefox-prefs.patch diff -u packages/mozilla-firefox/mozilla-firefox-prefs.patch:1.4 packages/mozilla-firefox/mozilla-firefox-prefs.patch:1.4.2.1 --- packages/mozilla-firefox/mozilla-firefox-prefs.patch:1.4 Mon Jun 23 14:58:27 2008 +++ packages/mozilla-firefox/mozilla-firefox-prefs.patch Fri Jun 5 15:19:36 2009 @@ -1,7 +1,7 @@ -diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js ---- mozilla.orig/browser/app/profile/firefox.js 2008-06-21 12:55:30.000000000 +0200 -+++ mozilla/browser/app/profile/firefox.js 2008-06-21 15:25:48.000000000 +0200 -@@ -89,12 +89,12 @@ +diff -ur mozilla-1.9.1/browser/app/profile/firefox.js mozilla-1.9.1.new/browser/app/profile/firefox.js +--- mozilla-1.9.1/browser/app/profile/firefox.js 2009-04-24 03:46:36.000000000 +0200 ++++ mozilla-1.9.1.new/browser/app/profile/firefox.js 2009-06-05 15:16:38.961559500 +0200 +@@ -92,12 +92,12 @@ // App-specific update preferences // Whether or not app updates are enabled @@ -16,7 +16,7 @@ // Defines how the Application Update Service notifies the user about updates: // -@@ -186,7 +186,7 @@ +@@ -187,7 +187,7 @@ // Whether or not the application should check at startup each time if it // is the default browser. @@ -25,7 +25,7 @@ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore -@@ -445,7 +445,7 @@ +@@ -491,7 +491,7 @@ pref("alerts.totalOpenTime", 4000); pref("browser.xul.error_pages.enabled", true); @@ -34,7 +34,7 @@ // We want to make sure mail URLs are handled externally... pref("network.protocol-handler.external.mailto", true); // for mail -@@ -592,10 +592,10 @@ +@@ -648,10 +648,10 @@ #ifdef MOZ_SAFE_BROWSING // Safe browsing does nothing unless this pref is set @@ -46,49 +46,47 @@ +pref("browser.safebrowsing.malware.enabled", false); // Non-enhanced mode (local url lists) URL list to check for updates - pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.1";); -@@ -739,7 +739,7 @@ - // 0 - don't pre-populate anything - // 1 - pre-populate site URL, but don't fetch certificate - // 2 - pre-populate site URL and pre-fetch certificate --pref("browser.ssl_override_behavior", 1); -+pref("browser.ssl_override_behavior", 2); - - // Controls the display of domain in the identity box for SSL connections. - // 0 - do not show domain -diff -ur mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul ---- mozilla.orig/browser/base/content/baseMenuOverlay.xul 2008-06-21 12:55:29.000000000 +0200 -+++ mozilla/browser/base/content/baseMenuOverlay.xul 2008-06-21 15:08:33.000000000 +0200 -@@ -97,12 +97,6 @@ + pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.2";); +Tylko w mozilla-1.9.1.new/browser/app/profile: firefox.js~ +diff -ur mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul mozilla-1.9.1.new/browser/base/content/baseMenuOverlay.xul +--- mozilla-1.9.1/browser/base/content/baseMenuOverlay.xul 2009-04-24 03:46:36.000000000 +0200 ++++ mozilla-1.9.1.new/browser/base/content/baseMenuOverlay.xul 2009-06-05 15:17:27.371040870 +0200 +@@ -97,14 +97,6 @@ label="&helpReleaseNotes.label;" - oncommand="openReleaseNotes(event)" + oncommand="openReleaseNotes()" onclick="checkForMiddleClick(this, event);"/> - <menuseparator id="updateSeparator"/> +-#ifdef MOZ_UPDATER - <menuitem id="checkForUpdates" - accesskey="&updateCmd.accesskey;" - label="&updateCmd.label;" - class="menuitem-iconic" - oncommand="checkForUpdates();"/> +-#endif <menuseparator id="aboutSeparator"/> <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;" -diff -ur mozilla.orig/browser/components/preferences/advanced.xul mozilla/browser/components/preferences/advanced.xul ---- mozilla.orig/browser/components/preferences/advanced.xul 2008-06-21 12:55:30.000000000 +0200 -+++ mozilla/browser/components/preferences/advanced.xul 2008-06-21 16:01:22.000000000 +0200 -@@ -267,10 +267,6 @@ +Tylko w mozilla-1.9.1.new/browser/base/content: baseMenuOverlay.xul~ +diff -ur mozilla-1.9.1/browser/components/preferences/advanced.xul mozilla-1.9.1.new/browser/components/preferences/advanced.xul +--- mozilla-1.9.1/browser/components/preferences/advanced.xul 2009-04-24 03:46:37.000000000 +0200 ++++ mozilla-1.9.1.new/browser/components/preferences/advanced.xul 2009-06-05 15:17:55.601991901 +0200 +@@ -268,12 +268,6 @@ <tabpanel id="updatePanel" orient="vertical" align="start"> <label control="autoUpdateGroup">&autoCheck.label;</label> <vbox class="indent" id="autoUpdateGroup" role="group"> +-#ifdef MOZ_UPDATER - <checkbox id="enableAppUpdate" - label="&enableAppUpdate.label;" - accesskey="&enableAppUpdate.accesskey;" - preference="app.update.enabled"/> +-#endif <checkbox id="enableAddonUpdate" label="&enableAddonsUpdate.label;" accesskey="&enableAddonsUpdate.accesskey;" -diff -ur mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd mozilla/browser/locales/en-US/chrome/overrides/netError.dtd ---- mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd 2008-06-21 12:55:30.000000000 +0200 -+++ mozilla/browser/locales/en-US/chrome/overrides/netError.dtd 2008-06-22 13:52:26.000000000 +0200 +Tylko w mozilla-1.9.1.new/browser/components/preferences: advanced.xul~ +diff -ur mozilla-1.9.1/browser/locales/en-US/chrome/overrides/netError.dtd mozilla-1.9.1.new/browser/locales/en-US/chrome/overrides/netError.dtd +--- mozilla-1.9.1/browser/locales/en-US/chrome/overrides/netError.dtd 2009-04-24 03:46:37.000000000 +0200 ++++ mozilla-1.9.1.new/browser/locales/en-US/chrome/overrides/netError.dtd 2009-06-05 15:18:58.260444405 +0200 @@ -175,6 +175,6 @@ <!ENTITY securityOverride.warningText " <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> @@ -97,3 +95,4 @@ <xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/> +<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/> "> +Tylko w mozilla-1.9.1.new/browser/locales/en-US/chrome/overrides: netError.dtd~ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox/mozilla-firefox-prefs.patch?r1=1.4&r2=1.4.2.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
