fixes for bugs 24758 2456 (commenting out lines) 23355 (changed .js pref sting) r=jud r=matt

suite/common/pref/pref-search.js

@@ -44,17 +44,22 @@ function InitSingleEngineList()
 	{
 		if (pref)
 		{
-			var defaultEngineURI = pref.CopyCharPref("browser.search.defaultengine");
+			var defaultEngineURI = pref.CopyDefaultCharPref("browser.search.defaultengine");
 		}
 	}
 	catch(ex)
 	{
 		defaultEngineURI = null;
 	}
-
+    dump("\n engineList:" + engineList +"\n");
-	if ((!defaultEngineURI) || (defaultEngineURI == ""))	return;
-
 	var engineList = document.getElementById("engineList");
+	engineList.selectedIndex = 4;
+	if ((!defaultEngineURI) || (defaultEngineURI == ""))	return;
+    
+	var engineList = document.getElementById("engineList");
+	engineList.selectedIndex = 2;
+	dump("\n engineList:" + engineList +"\n");
+	dump("\n engineListIndex:" + engineList.selectedIndex +"\n");
 	if (!engineList)	return;
 	var numEngines = engineList.length;
 	if (numEngines < 1)	return;
@@ -68,6 +73,7 @@ function InitSingleEngineList()
 		if (uri != defaultEngineURI)	continue;
 
 		engineList.selectedIndex = x;
+		dump("\n List:" + engineList.selectedIndex +"\n");
 		break;
 	}
 }
@@ -78,6 +84,7 @@ function setDefaultSearchEngine(object)
 {
 	var	defaultEngineURI = object.options[object.selectedIndex].getAttribute("value");
 	dump("Default Engine: '" + defaultEngineURI + "'\n");
+    dump(object.options.selectedIndex + "\n");
 
 	try
 	{

suite/common/pref/pref-smart_browsing.xul

@@ -85,7 +85,7 @@
 			<html:legend align="left">&internetKeywordsHeader.label;</html:legend>
 				<html:div class="hspace-both">
 				<html:input name="keyword" type="checkbox" id="browserGoBrowsingEnabled"
-              pref="true" preftype="bool" prefstring="browser.goBrowsing.enabled"/>
+              pref="true" preftype="bool" prefstring="keyword.enabled"/>
 				<html:label for="browserGoBrowsingEnabled" accesskey="n" tabindex="0">
 				&enableKeyCheck.label;
 				</html:label>

suite/common/pref/preftree.xul

@@ -68,17 +68,17 @@
         <treecell indent="true" url="chrome://pref/content/pref-navigator.xul" value="&navigator.label;"/> 
       </treerow>
       <treechildren>
-        <treeitem open="true">
+     <!--   <treeitem open="true">
           <treerow>
             <treecell indent="true" url="chrome://pref/content/pref-languages.xul" value="&languages.label;"/> 
           </treerow>
-        </treeitem>
+        </treeitem>  -->
 
-        <treeitem open="true">
+     <!--   <treeitem open="true">
           <treerow>
             <treecell indent="true" url="chrome://pref/content/pref-applications.xul" value="&applications.label;"/> 
-          </treerow>
+          </treerow>  
-        </treeitem>
+        </treeitem>  -->
 
         <treeitem open="true">
           <treerow>
@@ -164,7 +164,7 @@
       </treerow>
     </treeitem>
 
-    <treeitem container="true" open="true">
+<!-- <treeitem container="true" open="true">
       <treerow>       
         <treecell indent="true" url="chrome://pref/content/pref-offline.xul" value="&offline.label;"/> 
       </treerow>
@@ -176,7 +176,7 @@
           </treerow>
         </treeitem>
       </treechildren>
-    </treeitem>
+    </treeitem>  -->
     
     <treeitem container="true" open="true" id="advancedItem">
       <treerow>