Index: browser/app/profile/firefox.js
===================================================================
RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v
retrieving revision 1.101
diff -u -p -8 -r1.101 firefox.js
--- browser/app/profile/firefox.js 3 Mar 2006 20:34:56 -0000 1.101
+++ browser/app/profile/firefox.js 9 Mar 2006 03:03:12 -0000
@@ -194,32 +194,30 @@ pref("browser.download.manager.showWhenS
pref("browser.download.manager.useWindow", true);
pref("browser.download.manager.closeWhenDone", false);
pref("browser.download.manager.openDelay", 0);
pref("browser.download.manager.focusWhenStarting", false);
pref("browser.download.manager.flashCount", 2);
// pointer to the default engine name
pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-// pointer to the Web Search url (content area context menu)
-pref("browser.search.defaulturl", "chrome://browser-region/locale/region.properties");
+
+// disable logging for the search service by default
+pref("browser.search.log", false);
+
// Ordering of Search Engines in the Engine list.
pref("browser.search.order.1", "chrome://browser-region/locale/region.properties");
pref("browser.search.order.2", "chrome://browser-region/locale/region.properties");
pref("browser.search.param.Google.1.default", "chrome://branding/content/searchconfig.properties");
pref("browser.search.param.Google.1.custom", "chrome://branding/content/searchconfig.properties");
pref("browser.search.order.Yahoo.1", "chrome://branding/content/searchconfig.properties");
pref("browser.search.order.Yahoo.2", "chrome://branding/content/searchconfig.properties");
pref("browser.search.order.Yahoo", "chrome://branding/content/searchconfig.properties");
-// basic search popup constraint: minimum sherlock plugin version displayed
-// (note: must be a string representation of a float or it'll default to 0.0)
-pref("browser.search.basic.min_ver", "0.0");
-
// search bar results always open in a new tab
pref("browser.search.openintab", false);
// send ping to the server to update
pref("browser.search.update", true);
pref("browser.history.grouping", "day");
pref("browser.sessionhistory.max_entries", 50);
Index: browser/base/jar.mn
===================================================================
RCS file: /cvsroot/mozilla/browser/base/jar.mn,v
retrieving revision 1.98
diff -u -p -8 -r1.98 jar.mn
--- browser/base/jar.mn 18 Oct 2005 04:38:14 -0000 1.98
+++ browser/base/jar.mn 9 Mar 2006 03:03:12 -0000
@@ -26,21 +26,16 @@ browser.jar:
* content/browser/pageInfo.xul (content/pageInfo.xul)
* content/browser/pageReport.js (content/pageReport.js)
* content/browser/pageReport.xul (content/pageReport.xul)
* content/browser/pageReportFirstTime.xul (content/pageReportFirstTime.xul)
* content/browser/safeMode.js (content/safeMode.js)
* content/browser/safeMode.xul (content/safeMode.xul)
* content/browser/sanitize.js (content/sanitize.js)
* content/browser/sanitize.xul (content/sanitize.xul)
-* content/browser/search.xml (content/search.xml)
-* content/browser/searchDialog.js (content/searchDialog.js)
-* content/browser/searchDialog.xul (content/searchDialog.xul)
-* content/browser/searchDialog.css (content/searchDialog.css)
-* content/browser/searchbarBindings.css (content/searchbarBindings.css)
* content/browser/utilityOverlay.js (content/utilityOverlay.js)
* content/browser/web-panels.js (content/web-panels.js)
* content/browser/web-panels.xul (content/web-panels.xul)
* content/browser/baseMenuOverlay.xul (content/baseMenuOverlay.xul)
# XXX: We should exclude this one as well (bug 71895)
* content/browser/hiddenWindow.xul (content/hiddenWindow.xul)
#ifdef XP_MACOSX
* content/browser/macBrowserOverlay.xul (content/macBrowserOverlay.xul)
Index: browser/base/content/browser-context.inc
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/browser-context.inc,v
retrieving revision 1.17
diff -u -p -8 -r1.17 browser-context.inc
--- browser/base/content/browser-context.inc 10 Feb 2006 20:28:50 -0000 1.17
+++ browser/base/content/browser-context.inc 9 Mar 2006 03:03:13 -0000
@@ -189,17 +189,17 @@
command="cmd_selectAll"/>