From 5df503bf707fbdd6ea0a8c569a7e94eee1da526d Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de"
 <cbiesinger%web.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 1 Sep 2004 17:46:23 +0000
Subject: [PATCH] Bug 254952 make MIMEService/MIMEInfo-users make use of UTF-8
 extensions r=bzbarsky sr=darin

git-svn-id: svn://10.0.0.236/trunk@161593 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/webbrowserpersist/src/nsWebBrowserPersist.cpp    | 2 +-
 mozilla/mailnews/mime/src/mimemoz2.cpp                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
index 90b2db5339e..bcbb8d12e39 100644
--- a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
+++ b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp
@@ -1290,7 +1290,7 @@ nsWebBrowserPersist::GetExtensionForContentType(const PRUnichar *aContentType, P
     rv = mMIMEService->GetPrimaryExtension(contentType, EmptyCString(), ext);
     if (NS_SUCCEEDED(rv))
     {
-        *aExt = ToNewUnicode(ext);
+        *aExt = UTF8ToNewUnicode(ext);
         NS_ENSURE_TRUE(*aExt, NS_ERROR_OUT_OF_MEMORY);
         return NS_OK;
     }
diff --git a/mozilla/mailnews/mime/src/mimemoz2.cpp b/mozilla/mailnews/mime/src/mimemoz2.cpp
index 5e7c37cc207..85c04d01405 100644
--- a/mozilla/mailnews/mime/src/mimemoz2.cpp
+++ b/mozilla/mailnews/mime/src/mimemoz2.cpp
@@ -287,7 +287,7 @@ ValidateRealName(nsMsgAttachmentData *aAttach, MimeHeaders *aHdrs)
       if (NS_SUCCEEDED(rv) && !fileExtension.IsEmpty())
       {
         newAttachName.Append(PRUnichar('.'));
-        newAttachName.AppendWithConversion(fileExtension);
+        AppendUTF8toUTF16(fileExtension, newAttachName);
       }
     }