From deac8d7850e1d9be896f20157f9c4b188cebaf45 Mon Sep 17 00:00:00 2001
From: "nhotta%netscape.com" <nhotta%netscape.com>
Date: Thu, 14 Sep 2000 22:28:32 +0000
Subject: [PATCH] Fixing solaris bustage.

---
 mailnews/mime/src/mimetpfl.cpp | 5 +++--
 mailnews/mime/src/mimetpla.cpp | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mailnews/mime/src/mimetpfl.cpp b/mailnews/mime/src/mimetpfl.cpp
index 8105499245af..15b43db5fb09 100644
--- a/mailnews/mime/src/mimetpfl.cpp
+++ b/mailnews/mime/src/mimetpfl.cpp
@@ -363,11 +363,12 @@ MimeInlineTextPlainFlowed_parse_line (char *line, PRInt32 length, MimeObject *ob
 
       nsAutoString ustr;
       nsCAutoString cstr;
+      nsCAutoString mailCharsetStr(mailCharset);
 
       cstr.Assign(newcstr);
       Recycle(newcstr);
 
-      rv = nsMsgI18NConvertToUnicode((nsCAutoString) mailCharset, cstr, ustr);
+      rv = nsMsgI18NConvertToUnicode(mailCharsetStr, cstr, ustr);
       if (NS_SUCCEEDED(rv))
       {
         PRUnichar *u;
@@ -376,7 +377,7 @@ MimeInlineTextPlainFlowed_parse_line (char *line, PRInt32 length, MimeObject *ob
         {
           ustr.Assign(u);
           Recycle(u);
-          rv = nsMsgI18NConvertFromUnicode((nsCAutoString) mailCharset, ustr, cstr);
+          rv = nsMsgI18NConvertFromUnicode(mailCharsetStr, ustr, cstr);
           if (NS_SUCCEEDED(rv))
             lineResult.AssignWithConversion(cstr);   // create nsString which contains NON unicode 
                                                      // as the following code expecting it
diff --git a/mailnews/mime/src/mimetpla.cpp b/mailnews/mime/src/mimetpla.cpp
index ccc6343a5c22..991e8dac7306 100644
--- a/mailnews/mime/src/mimetpla.cpp
+++ b/mailnews/mime/src/mimetpla.cpp
@@ -447,8 +447,9 @@ MimeInlineTextPlain_parse_line (char *line, PRInt32 length, MimeObject *obj)
       // convert to unicode so it won't confuse ScanTXT.
       nsAutoString ustr;
       nsCAutoString cstr(line, length);
+      nsCAutoString mailCharsetStr(mailCharset);
 
-      rv = nsMsgI18NConvertToUnicode((nsCAutoString) mailCharset, cstr, ustr);
+      rv = nsMsgI18NConvertToUnicode(mailCharsetStr, cstr, ustr);
       if (NS_SUCCEEDED(rv))
       {
         PRUnichar *u;
@@ -457,7 +458,7 @@ MimeInlineTextPlain_parse_line (char *line, PRInt32 length, MimeObject *obj)
         {
           ustr.Assign(u);
           Recycle(u);
-          rv = nsMsgI18NConvertFromUnicode((nsCAutoString) mailCharset, ustr, cstr);
+          rv = nsMsgI18NConvertFromUnicode(mailCharsetStr, ustr, cstr);
           if (NS_SUCCEEDED(rv))
           {
             // create PRUnichar* which contains NON unicode