From c683d75e5615e437c3a8d8c428593bf87a444bcb Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Wed, 28 Oct 2009 17:22:57 +0100 Subject: [PATCH] Bug 522678 - remove browser.history.showsessions from firefox.js, r=mano --- browser/app/profile/firefox.js | 7 +------ toolkit/components/places/src/nsNavHistoryQuery.h | 3 --- .../places/tests/queries/test_abstime-annotation-domain.js | 2 +- .../places/tests/queries/test_abstime-annotation-uri.js | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index e342c0489bd..7b52b75425a 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -311,7 +311,6 @@ pref("browser.microsummary.updateGenerators", true); // enable search suggestions by default pref("browser.search.suggest.enabled", true); -pref("browser.history.showSessions", false); pref("browser.sessionhistory.max_entries", 50); pref("browser.history_expire_days", 180); pref("browser.history_expire_days_min", 90); @@ -363,10 +362,6 @@ pref("browser.allTabs.previews", false); pref("browser.ctrlTab.previews", false); pref("browser.ctrlTab.recentlyUsedLimit", 7); -// Default bookmark sorting -pref("browser.bookmarks.sort.direction", "descending"); -pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name"); - // By default, do not export HTML at shutdown. // If true, at shutdown the bookmarks in your menu and toolbar will // be exported as HTML to the bookmarks.html file. @@ -376,7 +371,7 @@ pref("browser.bookmarks.autoExportHTML", false); // keep in {PROFILEDIR}/bookmarkbackups. Special values: // -1: unlimited // 0: no backups created (and deletes all existing backups) -pref("browser.bookmarks.max_backups", 5); +pref("browser.bookmarks.max_backups", 10); // Scripts & Windows prefs pref("dom.disable_open_during_load", true); diff --git a/toolkit/components/places/src/nsNavHistoryQuery.h b/toolkit/components/places/src/nsNavHistoryQuery.h index d2db2085746..d56ba416f9d 100644 --- a/toolkit/components/places/src/nsNavHistoryQuery.h +++ b/toolkit/components/places/src/nsNavHistoryQuery.h @@ -129,7 +129,6 @@ public: mExpandQueries(PR_TRUE), mIncludeHidden(PR_FALSE), mRedirectsMode(nsINavHistoryQueryOptions::REDIRECTS_MODE_ALL), - mShowSessions(PR_FALSE), mMaxResults(0), mQueryType(nsINavHistoryQueryOptions::QUERY_TYPE_HISTORY) { } @@ -147,7 +146,6 @@ public: PRBool ExpandQueries() const { return mExpandQueries; } PRBool IncludeHidden() const { return mIncludeHidden; } PRUint16 RedirectsMode() const { return mRedirectsMode; } - PRBool ShowSessions() const { return mShowSessions; } PRUint32 MaxResults() const { return mMaxResults; } PRUint16 QueryType() const { return mQueryType; } @@ -172,7 +170,6 @@ private: PRPackedBool mExpandQueries; PRPackedBool mIncludeHidden; PRUint16 mRedirectsMode; - PRPackedBool mShowSessions; PRUint32 mMaxResults; PRUint16 mQueryType; }; diff --git a/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js b/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js index cd9ea6e1f6e..1c140a0dfef 100644 --- a/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js +++ b/toolkit/components/places/tests/queries/test_abstime-annotation-domain.js @@ -150,7 +150,7 @@ var testData = [ * testing for items that should be ignored while querying over history. * The Query:WHERE absoluteTime(matches) AND searchTerms AND URI * AND annotationIsNot(match) GROUP BY Domain, Day SORT BY uri,ascending - * excludeITems(should be ignored) ShowSessions(should be ignored) + * excludeITems(should be ignored) */ function run_test() { diff --git a/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js b/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js index a9258ff06e9..8daf574f63c 100644 --- a/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js +++ b/toolkit/components/places/tests/queries/test_abstime-annotation-uri.js @@ -148,7 +148,7 @@ var testData = [ * testing for items that should be ignored while querying over history. * The Query:WHERE absoluteTime(matches) AND searchTerms AND URI * AND annotationIsNot(match) GROUP BY Domain, Day SORT BY uri,ascending - * excludeITems(should be ignored) ShowSessions(should be ignored) + * excludeITems(should be ignored) */ function run_test() {