From ae718269e84ba39ca9344f4f2b3386157e7be44f Mon Sep 17 00:00:00 2001
From: "bnesse%netscape.com"
 <bnesse%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 16 Feb 2002 21:28:17 +0000
Subject: [PATCH] Fix for bug 125129. Convert status strings to UTF-8 before
 passing them on to the browser. r=sdagley, sr=beard.

git-svn-id: svn://10.0.0.236/trunk@114705 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/plugin/oji/MRJ/plugin/Source/MRJContext.cp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mozilla/plugin/oji/MRJ/plugin/Source/MRJContext.cp b/mozilla/plugin/oji/MRJ/plugin/Source/MRJContext.cp
index 2798912e65d..520a883a64a 100644
--- a/mozilla/plugin/oji/MRJ/plugin/Source/MRJContext.cp
+++ b/mozilla/plugin/oji/MRJ/plugin/Source/MRJContext.cp
@@ -934,12 +934,11 @@ void MRJContext::setStatusMessage(JMAppletViewerRef viewer, JMTextRef statusMsg)
 	MRJContext* thisContext;
 	OSStatus status = ::JMGetAppletViewerData(viewer, (JMClientData*)&thisContext);
 	if (status == noErr) {
-		Handle messageHandle = ::JMTextToMacOSCStringHandle(statusMsg);
-		if (messageHandle != NULL) {
-			::HLock(messageHandle);
-			const char* message = *messageHandle;
+		TextEncoding utf8 = CreateTextEncoding(kTextEncodingUnicodeDefault, kTextEncodingDefaultVariant, kUnicodeUTF8Format);
+		char* message = JMTextToEncoding(statusMsg, utf8);
+		if (message) {
 			thisContext->showStatus(message);
-			::DisposeHandle(messageHandle);
+			delete[] message;
 		}
 	}
 }