Bug 743677. (Av1) Port |Bug 702639 - Kill excludeItemsIfParentHasAnnotation query option| to SeaMonkey. r=neil.
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 10 Apr 2012 22:41:26 +0200
changeset 9872 ee008a4b615171b50adfb97f33304f8720bb3aca
parent 9871 d1e8ddf03898cc84f2eb5780fc2d05bf2cdc7141
child 9873 0a7f003186645dd9d86c396c8cb747b81d784fce
push id7518
push usersgautherie.bz@free.fr
push dateTue, 10 Apr 2012 20:43:16 +0000
treeherdercomm-central@0a7f00318664 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersneil
bugs743677, 702639
Bug 743677. (Av1) Port |Bug 702639 - Kill excludeItemsIfParentHasAnnotation query option| to SeaMonkey. r=neil.
suite/common/places/tests/unit/head_bookmarks.js
suite/common/src/nsSuiteGlue.js
--- a/suite/common/places/tests/unit/head_bookmarks.js
+++ b/suite/common/places/tests/unit/head_bookmarks.js
@@ -97,15 +97,15 @@ let (XULAppInfo = {
 
 
 const FILENAME_BOOKMARKS_HTML = "bookmarks.html";
 let (backup_date = new Date().toLocaleFormat("%Y-%m-%d")) {
   const FILENAME_BOOKMARKS_JSON = "bookmarks-" + backup_date + ".json";
 }
 
 // Smart bookmarks constants.
-const SMART_BOOKMARKS_VERSION = 2;
+const SMART_BOOKMARKS_VERSION = 3;
 const SMART_BOOKMARKS_ON_TOOLBAR = 1;
 const SMART_BOOKMARKS_ON_MENU = 3; // Takes in count the additional separator.
 
 // Default bookmarks constants.
 const DEFAULT_BOOKMARKS_ON_TOOLBAR = 4;
 const DEFAULT_BOOKMARKS_ON_MENU = 3; // Takes in count the additional separator.
--- a/suite/common/src/nsSuiteGlue.js
+++ b/suite/common/src/nsSuiteGlue.js
@@ -886,17 +886,17 @@ SuiteGlue.prototype = {
   ensurePlacesDefaultQueriesInitialized:
   function BG_ensurePlacesDefaultQueriesInitialized() {
     // This is actual version of the smart bookmarks, must be increased every
     // time smart bookmarks change.
     // When adding a new smart bookmark below, its newInVersion property must
     // be set to the version it has been added in, we will compare its value
     // to users' smartBookmarksVersion and add new smart bookmarks without
     // recreating old deleted ones.
-    const SMART_BOOKMARKS_VERSION = 2;
+    const SMART_BOOKMARKS_VERSION = 3;
     const SMART_BOOKMARKS_ANNO = "Places/SmartBookmark";
     const SMART_BOOKMARKS_PREF = "browser.places.smartBookmarksVersion";
 
     // TODO bug 399268: should this be a pref?
     const MAX_RESULTS = 10;
 
     // Get current smart bookmarks version.
     // By default, if the pref is not set up, we must create Smart Bookmarks.
@@ -947,17 +947,16 @@ SuiteGlue.prototype = {
                  title: placesBundle.GetStringFromName("recentlyBookmarkedTitle"),
                  uri: this._uri("place:folder=BOOKMARKS_MENU" +
                                 "&folder=UNFILED_BOOKMARKS" +
                                 "&folder=TOOLBAR" +
                                 "&queryType=" +
                                 Components.interfaces.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
                                 "&sort=" +
                                 Components.interfaces.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING +
-                                "&excludeItemIfParentHasAnnotation=livemark%2FfeedURI" +
                                 "&maxResults=" + MAX_RESULTS +
                                 "&excludeQueries=1"),
                  parent: bmsvc.bookmarksMenuFolder,
                  position: bookmarksMenuIndex++,
                  newInVersion: 1 };
         smartBookmarks.push(smart);
 
         // RECENT TAGS