From 7985265ef43813590786cfec2efcfe737dc0fe57 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 8 Mar 2005 23:00:01 +0000
Subject: [PATCH] hook up the language encoding menus to the fonts panel

git-svn-id: svn://10.0.0.236/trunk@170403 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/preferences/content/display.js    | 16 ++++++++++++++--
 .../components/preferences/content/display.xul   |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/mozilla/mail/components/preferences/content/display.js b/mozilla/mail/components/preferences/content/display.js
index 04cbf5ee194..561303439e1 100644
--- a/mozilla/mail/components/preferences/content/display.js
+++ b/mozilla/mail/components/preferences/content/display.js
@@ -72,7 +72,19 @@ var gDisplayPane = {
 
   fontOptionsDialog: function()
   {
-    document.documentElement.openSubDialog("chrome://messenger/content/preferences/fonts.xul",
-                                           "", null);  
+    document.documentElement.openSubDialog("chrome://messenger/content/preferences/fonts.xul", "", null);  
   },
+  
+  mCharsetMenuInitialized: false,
+  readDefaultCharset: function()
+  {
+    if (!this.mCharsetMenuInitialized) 
+    {
+      var os = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
+      os.notifyObservers(null, "charsetmenu-selected", "mailedit");     
+      this.mCharsetMenuInitialized = true;
+    }
+    return undefined;
+  },
+
 };
diff --git a/mozilla/mail/components/preferences/content/display.xul b/mozilla/mail/components/preferences/content/display.xul
index 3768d05368f..55cb5c2905e 100644
--- a/mozilla/mail/components/preferences/content/display.xul
+++ b/mozilla/mail/components/preferences/content/display.xul
@@ -226,9 +226,9 @@
               <rows>
                 <row align="center" class="indent">
                   <label control="sendDefaultCharsetList"
-                         value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" page="sendDefaultCharsetList"/>
+                         value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;"/>
                   <menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
-                            preference="mailnews.send_default_charset">
+                            preference="mailnews.send_default_charset" onpreferenceread="return gDisplayPane.readDefaultCharset();">
                     <template>
                       <menupopup>
                         <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>