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

Bug 323798: Keyword URL Needs to be localized, r=axel, sr=bzbarsky, a=mtschrep

Browse Source 
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@205021 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com
2006-07-28 01:57:25 +00:00
parent 2cd4b92a6c
commit b545f62acb
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/docshell/base/nsDefaultURIFixup.cpp
View File

@@ -45,6 +45,7 @@
#include "nsCRT.h"
#include "nsIPrefService.h"
#include "nsIPrefLocalizedString.h"
#include "nsIPlatformCharset.h"
#include "nsILocalFile.h"
@@ -373,7 +374,20 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
NS_ENSURE_STATE(mPrefBranch);
nsXPIDLCString url;
mPrefBranch->GetCharPref("keyword.URL", getter_Copies(url));
nsCOMPtr<nsIPrefLocalizedString> keywordURL;
mPrefBranch->GetComplexValue("keyword.URL",
NS_GET_IID(nsIPrefLocalizedString),
getter_AddRefs(keywordURL));
if (keywordURL) {
nsXPIDLString wurl;
keywordURL->GetData(getter_Copies(wurl));
CopyUTF16toUTF8(wurl, url);
} else {
// Fall back to a non-localized pref, for backwards compat
mPrefBranch->GetCharPref("keyword.URL", getter_Copies(url));
}
// if we can't find a keyword.URL keywords won't work.
if (url.IsEmpty())
return NS_ERROR_NOT_AVAILABLE;