fix for bug #404871: 'Most Visited Starred Pages', 'Recently Starred Pages', 'Recently Visited Starred Pages' don't include bookmarks from the personal toolbar folder r=mano, a=blocking-firefox-3+

This commit is contained in:
sspitzer@mozilla.org 2007-11-24 11:01:46 -08:00
parent 66c879c135
commit 8a9cae05e4

View File

@ -300,11 +300,12 @@ function initPlacesDefaultQueries() {
var bookmarksMenuFolder = PlacesUtils.bookmarksMenuFolderId; var bookmarksMenuFolder = PlacesUtils.bookmarksMenuFolderId;
var unfiledBookmarksFolder = PlacesUtils.unfiledBookmarksFolderId; var unfiledBookmarksFolder = PlacesUtils.unfiledBookmarksFolderId;
var toolbarFolder = PlacesUtils.toolbarFolderId;
var tagsFolder = PlacesUtils.tagsFolderId; var tagsFolder = PlacesUtils.tagsFolderId;
var defaultIndex = bmsvc.DEFAULT_INDEX; var defaultIndex = bmsvc.DEFAULT_INDEX;
// index = 0, make it the first folder // index = 0, make it the first folder
var placesFolder = bmsvc.createFolder(PlacesUtils.toolbarFolderId, var placesFolder = bmsvc.createFolder(toolbarFolder,
placesFolderTitle, placesFolderTitle,
0); 0);
@ -314,7 +315,9 @@ function initPlacesDefaultQueries() {
// exclude queries so that user created "saved searches" // exclude queries so that user created "saved searches"
// and these queries (added automatically) are excluded // and these queries (added automatically) are excluded
var recentlyCreatedBookmarksItem = bmsvc.insertBookmark(placesFolder, var recentlyCreatedBookmarksItem = bmsvc.insertBookmark(placesFolder,
IO.newURI("place:folder=" + bookmarksMenuFolder + "&folder=" + unfiledBookmarksFolder + IO.newURI("place:folder=" + bookmarksMenuFolder +
"&folder=" + unfiledBookmarksFolder +
"&folder=" + toolbarFolder +
"&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS + "&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
"&sort=" + "&sort=" +
Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING + Ci.nsINavHistoryQueryOptions.SORT_BY_DATEADDED_DESCENDING +
@ -324,7 +327,9 @@ function initPlacesDefaultQueries() {
defaultIndex, recentlyCreatedBookmarksTitle); defaultIndex, recentlyCreatedBookmarksTitle);
var recentlyVisitedBookmarksItem = bmsvc.insertBookmark(placesFolder, var recentlyVisitedBookmarksItem = bmsvc.insertBookmark(placesFolder,
IO.newURI("place:folder=" + bookmarksMenuFolder + "&folder=" + unfiledBookmarksFolder + IO.newURI("place:folder=" + bookmarksMenuFolder +
"&folder=" + unfiledBookmarksFolder +
"&folder=" + toolbarFolder +
"&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS + "&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
"&sort=" + Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING + "&sort=" + Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING +
"&excludeItemIfParentHasAnnotation=livemark%2FfeedURI" + "&excludeItemIfParentHasAnnotation=livemark%2FfeedURI" +
@ -332,7 +337,9 @@ function initPlacesDefaultQueries() {
defaultIndex, recentlyVisitedBookmarksTitle); defaultIndex, recentlyVisitedBookmarksTitle);
var mostVisitedBookmarksItem = bmsvc.insertBookmark(placesFolder, var mostVisitedBookmarksItem = bmsvc.insertBookmark(placesFolder,
IO.newURI("place:folder=" + bookmarksMenuFolder + "&folder=" + unfiledBookmarksFolder + IO.newURI("place:folder=" + bookmarksMenuFolder +
"&folder=" + unfiledBookmarksFolder +
"&folder=" + toolbarFolder +
"&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS + "&queryType=" + Ci.nsINavHistoryQueryOptions.QUERY_TYPE_BOOKMARKS +
"&sort=" + "&sort=" +
Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING + Ci.nsINavHistoryQueryOptions.SORT_BY_VISITCOUNT_DESCENDING +