Bug 235970/232722 Customize character coding dialog only works in browser r=jshin sr=mscott

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -1507,8 +1507,8 @@ function GetCharsetUIString()
     if (gCharsetTitle == null) {
       try {
         // check if we have a converter for this charset
-        var charsetAlias = gCharsetConvertManager.GetCharsetAlias(charset);
-        var encoderList = gCharsetConvertManager.GetEncoderList();
+        var charsetAlias = gCharsetConvertManager.getCharsetAlias(charset);
+        var encoderList = gCharsetConvertManager.getEncoderList();
         var found = false;
         while (encoderList.hasMore()) {
             if (charsetAlias == encoderList.getNext()) {

xpfe/global/resources/content/charsetOverlay.js

@@ -15,10 +15,6 @@ function MultiplexHandler(event)
         // please remove this else statement, once the charset prefs moves to the pref window
         window.openDialog("chrome://communicator/content/pref/pref-charset.xul",
                           "_blank", "chrome,modal,resizable", "browser");
-    } else if (name == 'charsetCustomizeMail') {
-        // please remove this else statement, once the charset prefs moves to the pref window
-        window.openDialog("chrome://communicator/content/pref/pref-charset.xul",
-                          "_blank", "chrome,modal,resizable", "mailedit");
     } else {
         SetForcedCharset(node.getAttribute('id'));
         SetDefaultCharacterSet(node.getAttribute('id'));
@@ -37,7 +33,9 @@ function MailMultiplexHandler(event)
         charset = charset.substring('charset.'.length, charset.length)
         MessengerSetDefaultCharacterSet(charset);
     } else if (name == 'charsetCustomize') {
-        //do nothing - please remove this else statement, once the charset prefs moves to the pref window
+        // please remove this else statement, once the charset prefs moves to the pref window
+        window.openDialog("chrome://communicator/content/pref/pref-charset.xul",
+                          "_blank", "chrome,modal,resizable", "browser");
     } else {
         MessengerSetDefaultCharacterSet(node.getAttribute('id'));
     }
@@ -55,12 +53,28 @@ function ComposerMultiplexHandler(event)
         charset = charset.substring('charset.'.length, charset.length)
         EditorSetDocumentCharacterSet(charset);
     } else if (name == 'charsetCustomize') {
-        //do nothing - please remove this else statement, once the charset prefs moves to the pref window
+        // please remove this else statement, once the charset prefs moves to the pref window
+        window.openDialog("chrome://communicator/content/pref/pref-charset.xul",
+                          "_blank", "chrome,modal,resizable", "browser");
     } else {
         SetForcedEditorCharset(node.getAttribute('id'));
     }
 }
 
+function MaileditMultiplexHandler(event)
+{
+    var node = event.target;
+    var name = node.getAttribute('name');
+
+    if (name == 'charsetCustomize') {
+        // please remove this else statement, once the charset prefs moves to the pref window
+        window.openDialog("chrome://communicator/content/pref/pref-charset.xul",
+                          "_blank", "chrome,modal,resizable", "mailedit");
+    } else {
+        SetDocumentCharacterSet(node.id);
+    }
+}
+
 function SetDefaultCharacterSet(charset)
 {
     dump("Charset Overlay menu item pressed: " + charset + "\n");

xpfe/global/resources/content/charsetOverlay.xul

@@ -207,7 +207,7 @@
     </menu>
 
     <!-- Mail Edit Charset Menu -->
-    <menu id="maileditCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:MaileditCharsetMenuRoot" oncommand="SetDocumentCharacterSet(event.target.getAttribute('id'));" onpopupshowing="CreateMenu('mailedit');InitCharsetMenuCheckMark();" onpopupshown="CreateMenu('more-menu');">
+    <menu id="maileditCharsetMenu" label="&charsetMenu.label;" accesskey="&charsetMenu.accesskey;" datasources="rdf:charset-menu" ref="NC:MaileditCharsetMenuRoot" oncommand="MaileditMultiplexHandler(event);" onpopupshowing="CreateMenu('mailedit');InitCharsetMenuCheckMark();" onpopupshown="CreateMenu('more-menu');">
         <template>
             <rule>
                 <menupopup>
@@ -217,7 +217,7 @@
         </template>
 
         <menupopup>
-        <menuitem name="charsetCustomizeMail" label="&charsetCustomize.label;"
+        <menuitem name="charsetCustomize" label="&charsetCustomize.label;"
                   accesskey="&charsetCustomize.accesskey;"/>
         <menuseparator />
         </menupopup>