From d44531f21ee85fe3c5e6793372b0d1ebb038e2ee Mon Sep 17 00:00:00 2001
From: "rbs%maths.uq.edu.au"
 <rbs%maths.uq.edu.au@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 27 Sep 2001 18:28:24 +0000
Subject: [PATCH] bug 99010 - font changes. sr=waterson@netscape.com

git-svn-id: svn://10.0.0.236/trunk@103959 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../xmlterm/base/mozXMLTerminal.cpp           |  2 +-
 mozilla/modules/libpref/src/win/winpref.js    | 33 +++++++------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp
index dfa533c1cf5..867f1ebd627 100644
--- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp
+++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp
@@ -592,7 +592,7 @@ NS_IMETHODIMP mozXMLTerminal::ScreenSize(PRInt32* rows, PRInt32* cols,
                           NS_FONT_WEIGHT_NORMAL,
                           NS_FONT_DECORATION_NONE, 16);
 
-  result = presContext->GetDefaultFixedFont(defaultFixedFont);
+  result = presContext->GetDefaultFont(kPresContext_DefaultFixedFont_ID, defaultFixedFont);
   if (NS_FAILED(result))
     return result;
 
diff --git a/mozilla/modules/libpref/src/win/winpref.js b/mozilla/modules/libpref/src/win/winpref.js
index 436bcb30f92..4903080d979 100644
--- a/mozilla/modules/libpref/src/win/winpref.js
+++ b/mozilla/modules/libpref/src/win/winpref.js
@@ -42,25 +42,16 @@ pref("font.name.cursive.he", "Comic Sans MS");
 pref("font.name.serif.ja", "ＭＳ Ｐ明朝"); // "MS PMincho"
 pref("font.name.sans-serif.ja", "ＭＳ Ｐゴシック"); // "MS PGothic"
 pref("font.name.monospace.ja", "ＭＳ ゴシック"); // "MS Gothic"
-pref("font.name.serif.ja.1", "MS PMincho"); // "MS PMincho"
-pref("font.name.serif.ja.2", "MS PGothic"); // "MS PGothic"
-pref("font.name.serif.ja.3", "MS Mincho"); // "MS Mincho"
-pref("font.name.serif.ja.4", "MS Gothic"); // "MS Gothic"
-pref("font.name.sans-serif.ja.1", "MS PGothic"); // "MS PGothic"
-pref("font.name.sans-serif.ja.2", "MS PMincho"); // "MS PMincho"
-pref("font.name.sans-serif.ja.3", "MS Gothic"); // "MS Gothic"
-pref("font.name.sans-serif.ja.4", "MS Mincho"); // "MS Mincho"
-pref("font.name.monospace.ja.1", "MS Gothic"); // "MS Gothic"
-pref("font.name.monospace.ja.2", "MS Mincho"); // "MS Mincho"
-pref("font.name.monospace.ja.3", "MS PGothic"); // "MS PGothic"
-pref("font.name.monospace.ja.4", "MS PMincho"); // "MS PMincho"
+pref("font.name-list.serif.ja", "MS PMincho, MS PGothic, MS Mincho, MS Gothic");
+pref("font.name-list.sans-serif.ja", "MS PGothic, MS PMincho, MS Gothic, MS Mincho");
+pref("font.name-list.monospace.ja", "MS Gothic, MS Mincho, MS PGothic, MS PMincho");
 
 pref("font.name.serif.ko", "굴림"); // "Gulim" 
 pref("font.name.sans-serif.ko", "굴림"); // "Gulim" 
 pref("font.name.monospace.ko", "굴림체"); // "GulimChe" 
-pref("font.name.serif.ko.1", "Gulim"); 
-pref("font.name.sans-serif.ko.1", "Gulim"); 
-pref("font.name.monospace.ko.1", "GulimChe"); 
+pref("font.name-list.serif.ko", "Gulim"); 
+pref("font.name-list.sans-serif.ko", "Gulim"); 
+pref("font.name-list.monospace.ko", "GulimChe"); 
 
 pref("font.name.serif.th", "Times New Roman");
 pref("font.name.sans-serif.th", "Arial");
@@ -100,16 +91,16 @@ pref("font.name.cursive.x-western", "Comic Sans MS");
 pref("font.name.serif.zh-CN", "宋体"); //MS Song
 pref("font.name.sans-serif.zh-CN", "黑体"); //MS Hei
 pref("font.name.monospace.zh-CN", "黑体");  //MS Hei
-pref("font.name.serif.zh-CN.1", "MS Song");
-pref("font.name.sans-serif.zh-CN.1", "MS Hei");
-pref("font.name.monospace.zh-CN.1", "MS Hei");
+pref("font.name-list.serif.zh-CN", "MS Song");
+pref("font.name-list.sans-serif.zh-CN", "MS Hei");
+pref("font.name-list.monospace.zh-CN", "MS Hei");
 
 pref("font.name.serif.zh-TW", "細明體"); // "MingLiU" 
 pref("font.name.sans-serif.zh-TW", "細明體"); // "MingLiU" 
 pref("font.name.monospace.zh-TW", "細明體"); // "MingLiU" 
-pref("font.name.serif.zh-TW.1", "MingLiU"); 
-pref("font.name.sans-serif.zh-TW.1", "MingLiU"); 
-pref("font.name.monospace.zh-TW.1", "MingLiU"); 
+pref("font.name-list.serif.zh-TW", "MingLiU"); 
+pref("font.name-list.sans-serif.zh-TW", "MingLiU"); 
+pref("font.name-list.monospace.zh-TW", "MingLiU"); 
 
 pref("font.default", "serif");
 pref("font.size.variable.ar", 16);