Even better.
git-svn-id: svn://10.0.0.236/trunk@56625 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
ac3caf9603
commit
e8458f5b5a
@ -29,10 +29,7 @@ config("timebomb.relative_timebomb_secret_name","general.bproxy_cert_digest");
|
||||
config("timebomb.relative_timebomb_days",-1);
|
||||
config("timebomb.relative_timebomb_warning_days",-1);
|
||||
|
||||
// various default search settings
|
||||
pref("network.search.url","http://cgi.netscape.com/cgi-bin/url_search.cgi?search=");
|
||||
pref("browser.search.opensidebarsearchpanel", true);
|
||||
pref("browser.search.powermode", 0);
|
||||
|
||||
pref("general.bproxy_cert_digest",0);
|
||||
|
||||
@ -104,6 +101,12 @@ pref("browser.download_window_rect", "-1,-1,-1,-1");
|
||||
pref("browser.wfe.ignore_def_check",false);
|
||||
pref("browser.wfe.use_windows_colors",true);
|
||||
pref("browser.startup_mode",1);
|
||||
|
||||
// various default search settings
|
||||
pref("browser.search.defaulturl", "http://search.netscape.com/cgi-bin/search?search=");
|
||||
pref("browser.search.opensidebarsearchpanel", true);
|
||||
pref("browser.search.powermode", 0);
|
||||
|
||||
localDefPref("browser.bookmark_location", "");
|
||||
localDefPref("browser.addressbook_location", "");
|
||||
localDefPref("browser.socksfile_location", "");
|
||||
|
||||
@ -457,7 +457,6 @@ function savePage( url ) {
|
||||
|
||||
function UpdateBookmarksLastVisitedDate(event)
|
||||
{
|
||||
|
||||
if (window.content.location.href && window.content.location.href != "")
|
||||
{
|
||||
try
|
||||
@ -478,7 +477,6 @@ function UpdateBookmarksLastVisitedDate(event)
|
||||
|
||||
function UpdateInternetSearchResults(event)
|
||||
{
|
||||
|
||||
if (window.content.location.href && window.content.location.href != "")
|
||||
{
|
||||
try
|
||||
@ -888,9 +886,7 @@ function OpenSearch(tabName, searchStr)
|
||||
searchMode = pref.GetIntPref("browser.search.powermode");
|
||||
autoOpenSearchPanel = pref.GetBoolPref("browser.search.opensidebarsearchpanel");
|
||||
searchEngineURI = pref.CopyCharPref("browser.search.defaultengine");
|
||||
|
||||
// rjc Note: don't use this old default preference, its for fuzzy URL matching
|
||||
// defaultSearchURL = pref.CopyCharPref("network.search.url");
|
||||
defaultSearchURL = pref.CopyCharPref("browser.search.defaulturl");
|
||||
}
|
||||
catch(ex)
|
||||
{
|
||||
@ -899,7 +895,7 @@ function OpenSearch(tabName, searchStr)
|
||||
if ((defaultSearchURL == null) || (defaultSearchURL == ""))
|
||||
{
|
||||
// Fallback to a Netscape default (one that we can get sidebar search results for)
|
||||
defaultSearchURL = "http://search.netscape.com/cgi-bin/search?";
|
||||
defaultSearchURL = "http://search.netscape.com/cgi-bin/search?search=";
|
||||
}
|
||||
|
||||
if (searchMode == 1)
|
||||
|
||||
@ -457,7 +457,6 @@ function savePage( url ) {
|
||||
|
||||
function UpdateBookmarksLastVisitedDate(event)
|
||||
{
|
||||
|
||||
if (window.content.location.href && window.content.location.href != "")
|
||||
{
|
||||
try
|
||||
@ -478,7 +477,6 @@ function UpdateBookmarksLastVisitedDate(event)
|
||||
|
||||
function UpdateInternetSearchResults(event)
|
||||
{
|
||||
|
||||
if (window.content.location.href && window.content.location.href != "")
|
||||
{
|
||||
try
|
||||
@ -888,9 +886,7 @@ function OpenSearch(tabName, searchStr)
|
||||
searchMode = pref.GetIntPref("browser.search.powermode");
|
||||
autoOpenSearchPanel = pref.GetBoolPref("browser.search.opensidebarsearchpanel");
|
||||
searchEngineURI = pref.CopyCharPref("browser.search.defaultengine");
|
||||
|
||||
// rjc Note: don't use this old default preference, its for fuzzy URL matching
|
||||
// defaultSearchURL = pref.CopyCharPref("network.search.url");
|
||||
defaultSearchURL = pref.CopyCharPref("browser.search.defaulturl");
|
||||
}
|
||||
catch(ex)
|
||||
{
|
||||
@ -899,7 +895,7 @@ function OpenSearch(tabName, searchStr)
|
||||
if ((defaultSearchURL == null) || (defaultSearchURL == ""))
|
||||
{
|
||||
// Fallback to a Netscape default (one that we can get sidebar search results for)
|
||||
defaultSearchURL = "http://search.netscape.com/cgi-bin/search?";
|
||||
defaultSearchURL = "http://search.netscape.com/cgi-bin/search?search=";
|
||||
}
|
||||
|
||||
if (searchMode == 1)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user