Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-16 22:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes bug 259979 "Changes to keyword.URL require restarting Firefox" patch by lesx99@lycos.com, r=biesi, sr=darin

Browse Source
This commit is contained in:
darin%meer.net 2004-11-16 16:17:59 +00:00
parent 2ca4c9c6ad
commit db17c93d73
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
netwerk/protocol/keyword/src/nsKeywordProtocolHandler.cpp
View File

@ -55,21 +55,6 @@ static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
nsKeywordProtocolHandler::nsKeywordProtocolHandler() {
}
nsresult
nsKeywordProtocolHandler::Init() {
nsresult rv;
nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
nsXPIDLCString url;
rv = prefs->GetCharPref("keyword.URL", getter_Copies(url));
// if we can't find a keyword.URL keywords won't work.
if (NS_FAILED(rv) || !url || !*url) return NS_ERROR_FAILURE;
mKeywordURL.Assign(url);
return NS_OK;
}
nsKeywordProtocolHandler::~nsKeywordProtocolHandler() {
}
@ -84,10 +69,7 @@ nsKeywordProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aRes
if (ph == nsnull)
return NS_ERROR_OUT_OF_MEMORY;
NS_ADDREF(ph);
nsresult rv = ph->Init();
if (NS_SUCCEEDED(rv)) {
rv = ph->QueryInterface(aIID, aResult);
}
nsresult rv = ph->QueryInterface(aIID, aResult);
NS_RELEASE(ph);
return rv;
}
@ -183,14 +165,20 @@ NS_IMETHODIMP
nsKeywordProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
{
nsresult rv;
nsCOMPtr<nsIPrefBranch> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
NS_ASSERTION(!mKeywordURL.IsEmpty(), "someone's trying to use the keyword handler even though it hasn't been init'd");
nsXPIDLCString url;
rv = prefs->GetCharPref("keyword.URL", getter_Copies(url));
// if we can't find a keyword.URL keywords won't work.
if (url.IsEmpty())
return NS_ERROR_FAILURE;
nsCAutoString path;
rv = uri->GetPath(path);
if (NS_FAILED(rv)) return rv;
char *httpSpec = MangleKeywordIntoHTTPURL(path.get(), mKeywordURL.get());
char *httpSpec = MangleKeywordIntoHTTPURL(path.get(), url.get());
if (!httpSpec) return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr<nsIIOService> serv(do_GetIOService(&rv));

5
netwerk/protocol/keyword/src/nsKeywordProtocolHandler.h
View File

@ -63,11 +63,6 @@ public:
static NS_METHOD
Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
nsresult Init();
protected:
nsCAutoString mKeywordURL;
};
#endif /* nsKeywordProtocolHandler_h___ */