corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 60178

Browse Source 
Before calling browserChrome->SetStatus()
if mailtourl then UnEscape from utf-8.
if not,then UnEscape from doc charset
/r=ftang, /sr=blizzard
This commit is contained in:
yokoyama@netscape.com
2001-07-24 22:37:40 +00:00
parent 0a161e1465
commit 82c6edcf57
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
docshell/base/nsWebShell.cpp
View File

@@ -120,6 +120,7 @@ typedef unsigned long HMTX;
//XXX for nsIPostData; this is wrong; we shouldn't see the nsIDocument type
#include "nsIDocument.h"
#include "nsITextToSubURI.h"
#ifdef NS_DEBUG
/**
@@ -798,11 +799,43 @@ nsWebShell::OnOverLink(nsIContent* aContent,
const PRUnichar* aTargetSpec)
{
nsCOMPtr<nsIWebBrowserChrome> browserChrome(do_GetInterface(mTreeOwner));
nsresult rv = NS_ERROR_FAILURE;
if(browserChrome)
browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_LINK, aURLSpec);
if(browserChrome) {
nsCOMPtr<nsITextToSubURI> textToSubURI = do_GetService(NS_ITEXTTOSUBURI_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
return NS_OK;
PRUnichar *uStr;
nsString aSpec(aURLSpec);
PRInt32 pos = aSpec.FindChar(':');
nsAutoString scheme;
static const char kMailToURI[] = "mailto";
// If the scheme is mailtourl then should not convert from a document charset
if ((pos == (PRInt32)(sizeof kMailToURI - 1)) && (aSpec.Left(scheme, pos) != -1) &&
scheme.EqualsIgnoreCase(kMailToURI)) {
// use UTF-8 instead and apply URL escape.
rv = textToSubURI->UnEscapeAndConvert("UTF-8",NS_ConvertUCS2toUTF8(aURLSpec).get(), &uStr);
}
else {
// use doc charset instead and apply URL escape.
nsCOMPtr<nsIPresShell> presShell;
nsCOMPtr<nsIDocument> doc;
nsDocShell::GetPresShell(getter_AddRefs(presShell));
NS_ENSURE_TRUE(presShell, NS_ERROR_FAILURE);
presShell->GetDocument(getter_AddRefs(doc));
NS_ENSURE_TRUE(doc, NS_ERROR_FAILURE);
nsAutoString charset;
NS_ENSURE_SUCCESS(doc->GetDocumentCharacterSet(charset), NS_ERROR_FAILURE);
rv = textToSubURI->UnEscapeAndConvert(NS_ConvertUCS2toUTF8(charset.get()).get(),
NS_ConvertUCS2toUTF8(aURLSpec).get(), &uStr);
}
if (NS_SUCCEEDED(rv)) {
rv = browserChrome->SetStatus(nsIWebBrowserChrome::STATUS_LINK, uStr);
nsMemory::Free(uStr);
}
}
return rv;
}
NS_IMETHODIMP