From ba83736aa198c6766684f637ee085714a4ffd670 Mon Sep 17 00:00:00 2001 From: "nhotta%netscape.com" Date: Wed, 21 Jun 2000 23:26:36 +0000 Subject: [PATCH] Changed to apply UTF-8 to UCS2 conversion before assigning the string to nsString, bug 42873, r=cata. git-svn-id: svn://10.0.0.236/trunk@72838 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/docshell/base/nsWebShell.cpp | 2 +- mozilla/webshell/src/nsWebShell.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 586751bddd2..b4b2b09dc59 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1203,7 +1203,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, { // only send non-qualified hosts to the keyword server nsAutoString keywordSpec; keywordSpec.AssignWithConversion("keyword:"); - keywordSpec.AppendWithConversion(host); + keywordSpec.Append(NS_ConvertUTF8toUCS2(host)); return LoadURI(keywordSpec.GetUnicode()); } // end keywordsEnabled } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 586751bddd2..b4b2b09dc59 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -1203,7 +1203,7 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, { // only send non-qualified hosts to the keyword server nsAutoString keywordSpec; keywordSpec.AssignWithConversion("keyword:"); - keywordSpec.AppendWithConversion(host); + keywordSpec.Append(NS_ConvertUTF8toUCS2(host)); return LoadURI(keywordSpec.GetUnicode()); } // end keywordsEnabled }