Rewrite fix for bug 23111. Now use new API for retreiving file system character set. R=nhotta

mailnews/compose/src/nsMsgCompUtils.cpp

@@ -37,9 +37,6 @@
 #include "nsSpecialSystemDirectory.h"
 #include "nsIDocumentEncoder.h"    // for editor output flags
 #include "nsIURI.h"
-#define NS_IMPL_IDS
-#include "nsIPlatformCharset.h"
-#undef NS_IMPL_IDS
 
 /* for GET_xxx_PART */
 #include "net.h"
@@ -1524,32 +1521,11 @@ msg_pick_real_name (nsMsgAttachmentHandler *attachment, const char *charset)
 
   if (parmFolding == 0 || parmFolding == 1)
   {
-    /* Get a charset used for the file. */
-    static nsAutoString aPlatformCharset;
-
-    if (aPlatformCharset.Length() < 1) 
-    {
-      nsCOMPtr <nsIPlatformCharset> platformCharset;
-      rv = nsComponentManager::CreateInstance(NS_PLATFORMCHARSET_PROGID, nsnull, 
-                                             NS_GET_IID(nsIPlatformCharset), getter_AddRefs(platformCharset));
-      if (NS_SUCCEEDED(rv)) 
-      {
-       rv = platformCharset->GetCharset(kPlatformCharsetSel_FileName, aPlatformCharset);
-      }
-      if (NS_FAILED(rv)) 
-      {
-       aPlatformCharset.SetString("ISO-8859-1");
-       rv = NS_OK;
-      }
-    }
-
     /* Convert to unicode */
     nsAutoString uStr;
-    rv = ConvertToUnicode(aPlatformCharset, attachment->m_real_name,uStr);
+    rv = ConvertToUnicode(msgCompFileSystemCharset(), attachment->m_real_name, uStr);
     if (NS_FAILED(rv)) 
-    {
       uStr.SetString(attachment->m_real_name);
-    }
 
     char *utf8Str = uStr.ToNewUTF8String();
 
@@ -1558,10 +1534,10 @@ msg_pick_real_name (nsMsgAttachmentHandler *attachment, const char *charset)
                         charset, 
 												nsMsgMIMEGetConformToStandard());
     if (mime2Name && (mime2Name != attachment->m_real_name))
-	  {
-		  PR_Free(attachment->m_real_name);
-		  attachment->m_real_name = mime2Name;
-	  }
+	{
+	  PR_Free(attachment->m_real_name);
+	  attachment->m_real_name = mime2Name;
+	}
     if (NULL != utf8Str)
     {
       nsAllocator::Free(utf8Str);