From 0418c05b64805535b51290c60995d3e13ad708a4 Mon Sep 17 00:00:00 2001 From: "bryner%brianryner.com" Date: Tue, 29 Nov 2005 21:59:13 +0000 Subject: [PATCH] Get rid of bogus assertions from OnAddURI/OnDeleteURI and instead notify observers of a visit-time change if the page is bookmarked. --- .../components/places/src/nsNavBookmarks.cpp | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/browser/components/places/src/nsNavBookmarks.cpp b/browser/components/places/src/nsNavBookmarks.cpp index d9c834a4f666..ee99e876137f 100644 --- a/browser/components/places/src/nsNavBookmarks.cpp +++ b/browser/components/places/src/nsNavBookmarks.cpp @@ -1020,24 +1020,28 @@ nsNavBookmarks::GetWantAllDetails(PRBool *aWant) NS_IMETHODIMP nsNavBookmarks::OnAddURI(nsIURI *aURI, PRTime aTime) { - // A new URI won't yet be bookmarked, so don't notify. -#ifdef DEBUG + // If the page is bookmarked, we need to notify observers PRBool bookmarked; IsBookmarked(aURI, &bookmarked); - NS_ASSERTION(!bookmarked, "New URI shouldn't be bookmarked!"); -#endif + if (bookmarked) { + for (PRInt32 i = 0; i < mObservers.Count(); ++i) { + mObservers[i]->OnItemChanged(aURI, NS_LITERAL_CSTRING("time")); + } + } return NS_OK; } NS_IMETHODIMP nsNavBookmarks::OnDeleteURI(nsIURI *aURI) { - // A deleted URI shouldn't be bookmarked. -#ifdef DEBUG + // If the page is bookmarked, we need to notify observers PRBool bookmarked; IsBookmarked(aURI, &bookmarked); - NS_ASSERTION(!bookmarked, "Deleted URI shouldn't be bookmarked!"); -#endif + if (bookmarked) { + for (PRInt32 i = 0; i < mObservers.Count(); ++i) { + mObservers[i]->OnItemChanged(aURI, NS_LITERAL_CSTRING("time")); + } + } return NS_OK; }