Bug 260924: MessengerSetDefaultCharacterSet should be named MessengerSetForcedCharacterSet. Patch by Eyal Rozenberg <eyalroz@technion.ac.il>, r=smontagu, sr=bienvenu

mailnews/base/resources/content/shareglue.js

@@ -48,7 +48,7 @@ function TemplatePage() {}
 function WizardPage() {}
 function CharacterSet(){}
 
-function MessengerSetDefaultCharacterSet(aCharset)
+function MessengerSetForcedCharacterSet(aCharset)
 {
 //    dump(aCharset);dump("\n");
   messenger.SetDocumentCharset(aCharset);

toolkit/content/charsetOverlay.js

@@ -29,11 +29,11 @@ function MailMultiplexHandler(event)
     } else if (name == 'charsetGroup') {
         var charset = node.getAttribute('id');
         charset = charset.substring('charset.'.length, charset.length)
-        MessengerSetDefaultCharacterSet(charset);
+        MessengerSetForcedCharacterSet(charset);
     } else if (name == 'charsetCustomize') {
         //do nothing - please remove this else statement, once the charset prefs moves to the pref window
     } else {
-        MessengerSetDefaultCharacterSet(node.getAttribute('id'));
+        MessengerSetForcedCharacterSet(node.getAttribute('id'));
     }
 }
 

xpfe/global/resources/content/charsetOverlay.js

@@ -31,13 +31,13 @@ function MailMultiplexHandler(event)
     } else if (name == 'charsetGroup') {
         var charset = node.getAttribute('id');
         charset = charset.substring('charset.'.length, charset.length)
-        MessengerSetDefaultCharacterSet(charset);
+        MessengerSetForcedCharacterSet(charset);
     } else 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", "browser");
     } else {
-        MessengerSetDefaultCharacterSet(node.getAttribute('id'));
+        MessengerSetForcedCharacterSet(node.getAttribute('id'));
     }
 }