From 6944cf81f0edab69f0165d20b986d09498961acf Mon Sep 17 00:00:00 2001
From: "bnesse%netscape.com"
 <bnesse%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 27 Jul 2006 14:54:54 +0000
Subject: [PATCH] Fix for bug 107798. Misc source cleanup and JS strict warning
 removal. r=sgehani, sr=alecf.

git-svn-id: svn://10.0.0.236/trunk@204675 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/suite/common/search/search-panel.js | 69 +++++++++++----------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/mozilla/suite/common/search/search-panel.js b/mozilla/suite/common/search/search-panel.js
index a35234bbc81..d1b53883ca3 100644
--- a/mozilla/suite/common/search/search-panel.js
+++ b/mozilla/suite/common/search/search-panel.js
@@ -281,45 +281,50 @@ function updateSearchMode()
 }
 
 function readRDFString(aDS,aRes,aProp) {
-          var n = aDS.GetTarget(aRes, aProp, true);
-          if (n)
-            return n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+  var n = aDS.GetTarget(aRes, aProp, true);
+  if (n)
+    return n.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+  return null;
 }
 
 
 function ensureDefaultEnginePrefs(aRDF,aDS) 
-   {
-
-    var prefbranch = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-    var defaultName = prefbranch.getComplexValue("browser.search.defaultenginename" , Components.interfaces.nsIPrefLocalizedString).data;
-    var kNC_Root = aRDF.GetResource("NC:SearchEngineRoot");
-    var kNC_child = aRDF.GetResource("http://home.netscape.com/NC-rdf#child");
-    var kNC_Name = aRDF.GetResource("http://home.netscape.com/NC-rdf#Name");
+{
+  var prefbranch = Components.classes["@mozilla.org/preferences-service;1"]
+                             .getService(Components.interfaces.nsIPrefBranch);
+  var defaultName = prefbranch.getComplexValue("browser.search.defaultenginename",
+                                               Components.interfaces.nsIPrefLocalizedString).data;
+  var kNC_Root = aRDF.GetResource("NC:SearchEngineRoot");
+  var kNC_child = aRDF.GetResource("http://home.netscape.com/NC-rdf#child");
+  var kNC_Name = aRDF.GetResource("http://home.netscape.com/NC-rdf#Name");
           
-    var arcs = aDS.GetTargets(kNC_Root, kNC_child, true);
-    while (arcs.hasMoreElements()) {
-        var engineRes = arcs.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
-        var name = readRDFString(aDS, engineRes, kNC_Name);
-        if (name == defaultName)
-		   prefbranch.setCharPref("browser.search.defaultengine", engineRes.Value);
-    }
+  var arcs = aDS.GetTargets(kNC_Root, kNC_child, true);
+  while (arcs.hasMoreElements()) {
+    var engineRes = arcs.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
+    var name = readRDFString(aDS, engineRes, kNC_Name);
+    if (name == defaultName)
+      prefbranch.setCharPref("browser.search.defaultengine", engineRes.Value);
   }
+}
 
 
-function ensureSearchPref() {
-   
+function ensureSearchPref()
+{
+  var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                      .getService(Components.interfaces.nsIRDFService);
+  var prefbranch = Components.classes["@mozilla.org/preferences-service;1"]
+                             .getService(Components.interfaces.nsIPrefBranch);
+  var ds = rdf.GetDataSource("rdf:internetsearch");
+  var kNC_Name = rdf.GetResource("http://home.netscape.com/NC-rdf#Name");
+  var defaultEngine;
 
-   var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
-   var prefbranch = Components.classes["@mozilla.org/preferences-service;1"].getService(Components.interfaces.nsIPrefBranch);
-   var ds = rdf.GetDataSource("rdf:internetsearch");
-   var kNC_Name = rdf.GetResource("http://home.netscape.com/NC-rdf#Name");
-   try {
-        var defaultEngine = prefbranch.getCharPref("browser.search.defaultengine");
-        } catch(ex) {
-            ensureDefaultEnginePrefs(rdf, ds);
-            defaultEngine = prefbranch.getCharPref("browser.search.defaultengine");
-        }
-   }
+  try {
+    defaultEngine = prefbranch.getCharPref("browser.search.defaultengine");
+  } catch(ex) {
+    ensureDefaultEnginePrefs(rdf, ds);
+    defaultEngine = prefbranch.getCharPref("browser.search.defaultengine");
+  }
+}
 
 // Initialize the Search panel:
 // 1) init the category list
@@ -511,8 +516,8 @@ function loadEngines(aCategory)
 
 function focusTextBox()
 {
-	var textBox = document.getElementById("sidebar-search-text");
-	textBox.focus();
+  var textBox = document.getElementById("sidebar-search-text");
+  textBox.focus();
 }
 
 function SearchPanelShutdown()