fix 39790 . r=tao,nhotta move send_default_charset , view_default_charset to property

mailnews/base/util/nsMsgDBFolder.cpp

@@ -257,16 +257,16 @@ NS_IMETHODIMP nsMsgDBFolder::GetCharset(PRUnichar * *aCharset)
 	{
 		NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
 
-		char *prefCharset = nsnull;
+		PRUnichar *prefCharset = nsnull;
 		if (NS_SUCCEEDED(rv))
 		{
-			rv = prefs->CopyCharPref("mailnews.view_default_charset", &prefCharset);
+			rv = prefs->GetLocalizedUnicharPref("mailnews.view_default_charset", &prefCharset);
 		}
   
 		nsAutoString prefCharsetStr;
 		if(prefCharset)
 		{
-			prefCharsetStr.AssignWithConversion(prefCharset);
+			prefCharsetStr.Assign(prefCharset);
 			PR_Free(prefCharset);
 		}
 		else

mailnews/base/util/nsMsgI18N.cpp

@@ -416,13 +416,14 @@ char * nsMsgI18NGetDefaultMailCharset()
   NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &res); 
   if (nsnull != prefs && NS_SUCCEEDED(res))
   {
-      char *prefValue;
+      PRUnichar *prefValue;
-	  res = prefs->CopyCharPref("mailnews.send_default_charset", &prefValue);
+	  res = prefs->GetLocalizedUnicharPref("mailnews.send_default_charset", &prefValue);
 	  
 	  if (NS_SUCCEEDED(res)) 
 	  {
   		//TODO: map to mail charset (e.g. Shift_JIS -> ISO-2022-JP) bug#3941.
-  		 retVal = prefValue;
+  		 retVal = nsCRT::strdup(NS_ConvertUCS2toUTF8(prefValue));
+                 nsMemory::Free(prefValue);
 	  }
 	  else 
 		  retVal = nsCRT::strdup("ISO-8859-1");

mailnews/compose/prefs/resources/content/pref-messages.js

@@ -42,7 +42,7 @@ function startUp()
       if (prefInt) {
         prefInt = prefInt.getService();
         prefInt = prefInt.QueryInterface(Components.interfaces.nsIPref);
-        pref_string = prefInt.CopyCharPref("mailnews.view_default_charset");
+        pref_string = prefInt.getLocalizedUnicharPref("mailnews.view_default_charset");
       }
     }
   }

mailnews/compose/resources/content/MsgComposeCommands.js

@@ -496,7 +496,7 @@ function InitCharsetMenuCheckMark()
     dump("failed to get prefs service!\n");
     prefs = null;
   }
-  var send_default_charset = prefs.CopyCharPref("mailnews.send_default_charset");
+  var send_default_charset = prefs.getLocalizedUnicharPref("mailnews.send_default_charset");
 //  send_default_charset = send_default_charset.toUpperCase();
   dump("send_default_charset is " + send_default_charset + "\n");
 
@@ -531,7 +531,7 @@ function GetCharsetUIString()
       prefs = Components.classes['component://netscape/preferences'];
       prefs = prefs.getService();
       prefs = prefs.QueryInterface(Components.interfaces.nsIPref);
-      g_send_default_charset = prefs.CopyCharPref("mailnews.send_default_charset");
+      g_send_default_charset = prefs.getLocalizedUnicharPref("mailnews.send_default_charset");
     }
     catch (ex) {
       dump("failed to get prefs service!\n");

mailnews/mailnews.js

@@ -228,8 +228,8 @@ pref("mailnews.searchSubFolders",           true);
 pref("mailnews.searchServer",               true);
 pref("mailnews.sort_by_date_received",      false);
 
-pref("mailnews.send_default_charset",       "ISO-8859-1");
+pref("mailnews.send_default_charset",       "chrome://messenger/locale/messenger.properties");
-pref("mailnews.view_default_charset",       "ISO-8859-1");
+pref("mailnews.view_default_charset",       "chrome://messenger/locale/messenger.properties");
 pref("mailnews.force_charset_override",     false);
 
 pref("mailnews.language_sensitive_font",    true);

mailnews/mime/src/mimetext.cpp

@@ -115,7 +115,12 @@ MimeInlineText_initialize (MimeObject *obj)
           NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &rv);
           if ( NS_SUCCEEDED(rv) && prefs)
           {
-            prefs->CopyCharPref("mailnews.view_default_charset", &(text->defaultCharset));
+            PRUnichar* value;
+            rv = prefs->GetLocalizedUnicharPref("mailnews.view_default_charset", &value);
+            if(NS_SUCCEEDED(rv)) {
+              text->defaultCharset = nsCRT::strdup(NS_ConvertUCS2toUTF8(value));
+              nsMemory::Free(value);
+            }
           }
 
           if (!text->defaultCharset)

modules/libpref/src/init/mailnews.js

@@ -228,8 +228,8 @@ pref("mailnews.searchSubFolders",           true);
 pref("mailnews.searchServer",               true);
 pref("mailnews.sort_by_date_received",      false);
 
-pref("mailnews.send_default_charset",       "ISO-8859-1");
+pref("mailnews.send_default_charset",       "chrome://messenger/locale/messenger.properties");
-pref("mailnews.view_default_charset",       "ISO-8859-1");
+pref("mailnews.view_default_charset",       "chrome://messenger/locale/messenger.properties");
 pref("mailnews.force_charset_override",     false);
 
 pref("mailnews.language_sensitive_font",    true);

xpfe/components/prefwindow/resources/content/nsPrefWindow.js

@@ -146,7 +146,12 @@ nsPrefWindow.prototype =
                     case "color":
                     case "string":
                     default:
-                      return !aDefaultFlag ? pref.CopyUnicharPref( aPrefString ) : pref.CopyDefaultUnicharPref( aPrefString );
+                      if((aPrefString == "mailnews.view_default_charset") ||
+                         (aPrefString == "mailnews.send_default_charset")) {
+                            return  pref.getLocalizedUnicharPref( aPrefString );
+                      } else {
+                         return !aDefaultFlag ? pref.CopyUnicharPref( aPrefString ) : pref.CopyDefaultUnicharPref( aPrefString );
+                      }
                       break;
                   }
               }