Bug 1303532 - Port |Bug 910192 - Get rid of intl.charset.default as a localizable pref| to MailNews and SeaMonkey r,a=Ratty,Aceman

editor/ui/composer/content/editor.js

@@ -2314,14 +2314,8 @@ function EditorSetDefaultPrefsAndDoctype()
     // hitting other 8-bit char in other meta tags
     // grab charset pref and make it the default charset
     var element;
-    var prefCharsetString = 0;
-    try
-    {
-      prefCharsetString = Services.prefs.getComplexValue("intl.charset.default",
-                                                         Components.interfaces.nsIPrefLocalizedString).data;
-    }
-    catch (ex) {}
-    if ( prefCharsetString && prefCharsetString != 0)
+    var prefCharsetString = Services.prefs.getCharPref("intl.charset.fallback.override");
+    if (prefCharsetString)
       editor.documentCharacterSet = prefCharsetString;
 
     // let's start by assuming we have an author in case we don't have the pref

suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp

@@ -250,7 +250,7 @@ nsThunderbirdProfileMigrator::PrefTransform gTransforms[] = {
 
   MAKESAMETYPEPREFTRANSFORM("intl.accept_charsets",                    String),
   MAKESAMETYPEPREFTRANSFORM("intl.accept_languages",                   String),
-  MAKESAMETYPEPREFTRANSFORM("intl.charset.default",                    String),
+  MAKESAMETYPEPREFTRANSFORM("intl.charset.fallback.override",          String),
 
   MAKESAMETYPEPREFTRANSFORM("javascript.enabled",                      Bool),
   MAKESAMETYPEPREFTRANSFORM("javascript.options.relimit",              Bool),