From fb180bf413327bc97c87e08376adf8fc66374a78 Mon Sep 17 00:00:00 2001
From: "mcafee%netscape.com" <mcafee%netscape.com>
Date: Wed, 28 Feb 2001 00:00:27 +0000
Subject: [PATCH] Backing out my attempt to fix (68208).  sr=alecf

---
 modules/libpref/src/init/all.js                             | 2 +-
 xpfe/components/prefwindow/resources/content/pref-fonts.js  | 4 ++--
 xpfe/components/prefwindow/resources/content/pref-fonts.xul | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 1ac548e86b4..c578fa9d5af 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -289,7 +289,7 @@ pref("intl.charsetmenu.browser.cache.size", 5);
 pref("intl.charset.detector",                "chrome://navigator/locale/navigator.properties");
 pref("intl.charset.default",                "chrome://navigator/locale/navigator.properties");
 
-pref("font.default", 1);  // 0=Sans-Serif, 1=Serif
+pref("font.default", "serif");
 pref("font.size.variable.ar", 16);
 pref("font.size.fixed.ar", 13);
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.js b/xpfe/components/prefwindow/resources/content/pref-fonts.js
index ca30a6f7108..84d633b0d48 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.js
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.js
@@ -216,7 +216,7 @@ function saveFontPrefs()
       {
         var currDPI = pref.GetIntPref( "browser.display.screen_resolution" );
         var currFonts = pref.GetIntPref( "browser.display.use_document_fonts" );
-        var currDefault = pref.GetIntPref( "font.default" );
+        var currDefault = pref.CopyUnicharPref( "font.default" );
       }
     catch(e)
       {
@@ -227,7 +227,7 @@ function saveFontPrefs()
       pref.SetIntPref( "browser.display.use_document_fonts", documentFonts );
     if( currDefault != defaultFont )
       {
-        pref.SetIntPref( "font.default", defaultFont );
+        pref.SetUnicharPref( "font.default", defaultFont );
       }
   }
   
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index c401a0a59d9..1c95b0167d5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -144,9 +144,9 @@
     
     <box autostretch="never" class="indent">
       <text class="label" value="&default.type.label;"/>
-      <radiogroup id="defaultFont" preftype="int" prefstring="font.default">
-        <radio group="defaultFont" data="1" value="&useDefaultFontSerif.label;" accesskey="&useDefaultFontSerif.accesskey;"/>
-        <radio group="defaultFont" data="0" value="&useDefaultFontSansSerif.label;" accesskey="&useDefaultFontSansSerif.accesskey;"/>
+      <radiogroup id="defaultFont" preftype="string" prefstring="font.default">
+        <radio group="defaultFont" data="serif" value="&useDefaultFontSerif.label;" accesskey="&useDefaultFontSerif.accesskey;"/>
+        <radio group="defaultFont" data="sans-serif" value="&useDefaultFontSansSerif.label;" accesskey="&useDefaultFontSansSerif.accesskey;"/>
       </radiogroup>
     </box>