From 9a1aa40989c6bf82c60b2a32eefa96869b0ffa16 Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.demon.co.uk" <bugzilla%standard8.demon.co.uk>
Date: Wed, 17 May 2006 02:39:39 +0000
Subject: [PATCH] Bug 264675 Make sure we respect locked prefs throughout UI.
 (Bv2) <pref-smart_browsing-ac.xul>. Patch by Serge GAUTHERIE
 <gautheri@noos.fr>, r=iann_bugzilla

---
 suite/common/pref/pref-smart_browsing-ac.xul | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/suite/common/pref/pref-smart_browsing-ac.xul b/suite/common/pref/pref-smart_browsing-ac.xul
index 31a8cd97574..4dd038ccb46 100644
--- a/suite/common/pref/pref-smart_browsing-ac.xul
+++ b/suite/common/pref/pref-smart_browsing-ac.xul
@@ -51,7 +51,9 @@
 
   <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
   <script type="application/x-javascript"><![CDATA[
-    
+
+    var gShowSearchLocked;
+
     window.onload = function()
     {
       setCheck("cbxAutoFill", window.arguments[0], window.arguments[4]);
@@ -63,31 +65,31 @@
       updateImage("AutoFill");
       updateImage("ShowPopup");
       updateImage("ShowSearch");
-      
+
       updateShowPopup();
     }
-    
+
     function onAccept()
     {
       window.opener.receiveACPrefs(getCheck("cbxAutoFill"), 
                                    getCheck("cbxShowPopup"),
                                    getCheck("cbxShowSearch"),
                                    getCheck("cbxMatchOnlyTyped"));
-                                         
+
       return true;                                           
     }
-    
+
     function getCheck(aName)
     {
       return document.getElementById(aName).checked;
     }
-    
+
     function setCheck(aName, aTruth, aDisabled)
     {
       document.getElementById(aName).checked = (aTruth == "true");
       document.getElementById(aName).disabled = (aDisabled == "true");
     }
-    
+
     function updateImage(aImg)
     {
      var img = document.getElementById("img"+aImg);
@@ -102,20 +104,20 @@
         img.setAttribute("hidden", !checked2 || !checked);
       }
     }
-    
+
     function updateShowPopup()
     {
       var spChecked = document.getElementById("cbxShowPopup").checked;
       var showSearch = document.getElementById("cbxShowSearch");
       showSearch.disabled = !spChecked || gShowSearchLocked;
     }
-    
+
     function doHelpButton() {
       openHelp('navigator_pref_autocomplete-adv');
     }
-    
+
   ]]></script>
-  
+
   <groupbox>
     <caption label="&autoCompleteAdvanced.title;"/>
     <vbox>
@@ -128,7 +130,7 @@
       <checkbox id="cbxMatchOnlyTyped" label="&autoCompleteMatchOnlyTyped.label;"/>
     </vbox>
   </groupbox>
-  
+
   <label value="&autocompletePreview.label;"/>
   <dialogheader>
     <vbox height="159">