From 9c3242b1d51aaacd9fc895dd2610eae8bbe6ed02 Mon Sep 17 00:00:00 2001
From: "matt%netscape.com" <matt%netscape.com>
Date: Wed, 22 Mar 2000 21:51:37 +0000
Subject: [PATCH] changing java pref string to the one in 4.7 and fixing cache
 opening code

---
 .../prefwindow/resources/content/pref-advanced.xul        | 2 +-
 .../components/prefwindow/resources/content/pref-cache.js | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 717c9df86c51..5ec9bda81d78 100644
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -44,7 +44,7 @@
 	<html:div >
     <html:input type="checkbox" id="advancedJavaAllow" 
                 prefdefval="true"
-                pref="true" preftype="bool" prefstring="advanced.java.allow"/>
+                pref="true" preftype="bool" prefstring="security.enable_java"/>
 		<html:label for="advancedJavaAllow" accesskey="&enbJavaCheck.accesskey;" tabindex="0">
 			&enbJavaCheck.label;
 		</html:label>
diff --git a/xpfe/components/prefwindow/resources/content/pref-cache.js b/xpfe/components/prefwindow/resources/content/pref-cache.js
index 431c42cff966..08f2c797c3ff 100644
--- a/xpfe/components/prefwindow/resources/content/pref-cache.js
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.js
@@ -1,12 +1,10 @@
-
 function prefCacheSelectFolder()
 {
-  dump("prefCacheSelectFolder \n");
   bundle = srGetStrBundle("chrome://pref/locale/prefutilities.properties");
   var folderField = document.getElementById("browserCacheDirectory");
-  var url = getFileOrFolderURL( bundle.GetStringFromName("cachefolder"), true );
+  var url = getFileOrFolderSpec( bundle.GetStringFromName("cachefolder"), true );
   if( url != -1 )
-    folderField.value = url;
+    folderField.value = url.URLString;
 }
 
 function prefClearMemCache()
@@ -23,4 +21,4 @@ function prefClearDiskCache()
 	var cache = Components.classes['component://netscape/network/cache?name=manager'].getService();
   var	cacheService = cache.QueryInterface( Components.interfaces.nsINetDataCacheManager);
 	cacheService.Clear( 12 );
-}
\ No newline at end of file
+}