Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the keyword: protocol handler. Expose the functionality on nsIURIFixup

Browse Source 
instead.  Bug 337339 and bug 264830, r=biesi, sr=darin


git-svn-id: svn://10.0.0.236/trunk@196633 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2006-05-16 03:02:28 +00:00
parent ea33f3688c
commit 12cfe9827f
13 changed files with 72 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/docshell/base/nsWebShell.cpp
View File

@@ -942,7 +942,6 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress,
if(keywordsEnabled && (kNotFound == dotLoc)) {
// only send non-qualified hosts to the keyword server
nsCAutoString keywordSpec("keyword:");
//
// If this string was passed through nsStandardURL by chance, then it
// may have been converted from UTF-8 to ACE, which would result in a
@@ -960,12 +959,9 @@ nsresult nsWebShell::EndPageLoad(nsIWebProgress *aProgress,
if (idnSrv &&
NS_SUCCEEDED(idnSrv->IsACE(host, &isACE)) && isACE &&
NS_SUCCEEDED(idnSrv->ConvertACEtoUTF8(host, utf8Host)))
keywordSpec.Append(utf8Host);
sURIFixup->KeywordToURI(utf8Host, getter_AddRefs(newURI));
else
keywordSpec.Append(host);
NS_NewURI(getter_AddRefs(newURI),
keywordSpec, nsnull);
sURIFixup->KeywordToURI(host, getter_AddRefs(newURI));
} // end keywordsEnabled
}