Bug 196834 all bookmarks lost when using "browser.bookmarks.file" pref and switching profile

r=ccarlen sr=alecf


git-svn-id: svn://10.0.0.236/trunk@235833 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2007-09-12 17:50:38 +00:00
parent 05e1a407b2
commit 7e459135bd

View File

@ -1820,7 +1820,7 @@ nsBookmarksService::Init()
NS_ASSERTION(observerService, "Could not get observer service.");
if (observerService) {
observerService->AddObserver(this, "profile-before-change", PR_TRUE);
observerService->AddObserver(this, "profile-do-change", PR_TRUE);
observerService->AddObserver(this, "profile-after-change", PR_TRUE);
#ifdef MOZ_PHOENIX
observerService->AddObserver(this, "quit-application", PR_TRUE);
#endif
@ -2580,7 +2580,7 @@ NS_IMETHODIMP nsBookmarksService::Observe(nsISupports *aSubject, const char *aTo
bookmarksFile.Delete(PR_FALSE);
}
}
else if (!nsCRT::strcmp(aTopic, "profile-do-change"))
else if (!nsCRT::strcmp(aTopic, "profile-after-change"))
{
// The profile has aleady changed.
rv = LoadBookmarks();