bug 244754 : URL is not shown in the status bar when hovering over a url-escaped URL in an encoding different from the document enecoding (r=darin, sr=bzbarsky)

git-svn-id: svn://10.0.0.236/trunk@169604 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jshin%mailaps.org
2005-02-22 18:25:12 +00:00
parent 59376921a4
commit b918fc6323
4 changed files with 23 additions and 13 deletions

View File

@@ -2835,11 +2835,11 @@ nsDocShell::DisplayLoadError(nsresult aError, nsIURI *aURI,
nsCOMPtr<nsITextToSubURI> textToSubURI(
do_GetService(NS_ITEXTTOSUBURI_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv))
rv = textToSubURI->UnEscapeURIForUI(charset, spec, formatStrs[0]);
if (NS_FAILED(rv)) {
CopyASCIItoUCS2(spec, formatStrs[0]);
rv = NS_OK;
}
// UnEscapeURIForUI always succeeds
textToSubURI->UnEscapeURIForUI(charset, spec, formatStrs[0]);
else
CopyUTF8toUTF16(spec, formatStrs[0]);
rv = NS_OK;
formatStrCount = 1;
error.AssignLiteral("fileNotFound");
}