Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 591371: use originalDefaultEngine for keyword search and about:home, r=jrmuizel, a=blocker

Browse Source 
--HG--
extra : rebase_source : 44727c4806b8810f7cdf12219ee717f00ac6e855
This commit is contained in:
Gavin Sharp 2010-08-27 16:39:20 -04:00
parent 39837fc7da
commit 138d201223
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/components/nsBrowserContentHandler.js
View File

@ -894,8 +894,7 @@ let AboutHomeUtils = {
loadDefaultSearchEngine: function AHU_loadDefaultSearchEngine()
{
// TODO: should use originalDefaultEngine once available, see bug 587691.
let defaultEngine = Services.search.defaultEngine;
let defaultEngine = Services.search.originalDefaultEngine;
let submission = defaultEngine.getSubmission("_searchTerms_");
if (submission.postData)
throw new Error("Home page does not support POST search engines.");

2
docshell/base/nsDefaultURIFixup.cpp
View File

@ -403,7 +403,7 @@ NS_IMETHODIMP nsDefaultURIFixup::KeywordToURI(const nsACString& aKeyword,
nsCOMPtr<nsIBrowserSearchService> searchSvc = do_GetService("@mozilla.org/browser/search-service;1");
if (searchSvc) {
nsCOMPtr<nsISearchEngine> defaultEngine;
searchSvc->GetDefaultEngine(getter_AddRefs(defaultEngine));
searchSvc->GetOriginalDefaultEngine(getter_AddRefs(defaultEngine));
if (defaultEngine) {
nsCOMPtr<nsISearchSubmission> submission;
// We want to allow default search plugins to specify alternate