From 81a741b9254d0f8c7dd9ed97e9802496d9f00938 Mon Sep 17 00:00:00 2001
From: "mconnor%steelgryphon.com"
 <mconnor%steelgryphon.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 12 Aug 2005 03:06:39 +0000
Subject: [PATCH] bug 271097 - add UI to enable turning off searchplugin
 auto-update, patch by O. Atsushi (torisugari@gmail.com), r+a=me

git-svn-id: svn://10.0.0.236/trunk@177630 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/app/profile/firefox.js                     | 3 +++
 mozilla/browser/components/preferences/advanced.xul        | 7 +++++++
 .../locales/en-US/chrome/browser/preferences/advanced.dtd  | 2 ++
 3 files changed, 12 insertions(+)

diff --git a/mozilla/browser/app/profile/firefox.js b/mozilla/browser/app/profile/firefox.js
index afa331a4021..7e6450f0403 100644
--- a/mozilla/browser/app/profile/firefox.js
+++ b/mozilla/browser/app/profile/firefox.js
@@ -217,6 +217,9 @@ pref("browser.search.order.Yahoo",            "chrome://branding/content/searchc
 // (note: must be a string representation of a float or it'll default to 0.0)
 pref("browser.search.basic.min_ver", "0.0");
 
+// send ping to the server to update
+pref("browser.search.update", true);
+
 pref("browser.history.grouping", "day");
 pref("browser.sessionhistory.max_entries", 50);
 pref("browser.sessionhistory.max_viewers", 3);
diff --git a/mozilla/browser/components/preferences/advanced.xul b/mozilla/browser/components/preferences/advanced.xul
index cbc5b8c8485..4979a2fbcf3 100644
--- a/mozilla/browser/components/preferences/advanced.xul
+++ b/mozilla/browser/components/preferences/advanced.xul
@@ -79,6 +79,7 @@
       <preference id="app.update.disable_button.showUpdateHistory"
                   name="app.update.disable_button.showUpdateHistory"
                   type="bool"/>
+      <preference id="browser.search.update"           name="browser.search.update"           type="bool"/>
 
       <preference id="security.enable_ssl2"            name="security.enable_ssl2"            type="bool"/>
       <preference id="security.enable_ssl3"            name="security.enable_ssl3"            type="bool"/>
@@ -161,6 +162,12 @@
                       label="&checkNow.label;" accesskey="&extensionsCheckNow.accesskey;"
                       oncommand="gAdvancedPane.checkForAddonUpdates();"/>
             </hbox>
+            <hbox>
+              <checkbox id="enableSearchUpdate"
+                        label="&enableSearchUpdate.label;"
+                        accesskey="&enableSearchUpdate.accesskey;"
+                        preference="browser.search.update"/>
+            </hbox>
           </vbox>
           <separator/>
           <label id="updateModeLabel" control="updateMode">&whenUpdatesFound.label;</label>
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index ac37525d0ba..1a2df07f562 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -19,6 +19,8 @@
 <!ENTITY enableAppUpdate.accesskey      "F">
 <!ENTITY enableExtensionUpdate.label    "Installed Extensions and Themes">
 <!ENTITY enableExtensionUpdate.accesskey "x">
+<!ENTITY enableSearchUpdate.label       "Search Engines">
+<!ENTITY enableSearchUpdate.accesskey   "h">
 <!ENTITY checkNow.label                 "Check Now...">
 <!ENTITY appCheckNow.accesskey          "N">
 <!ENTITY extensionsCheckNow.accesskey   "o">