From 78f4b21b83566468a3f30ca92a471d30fe55af80 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Sat, 18 Sep 1999 19:32:40 +0000 Subject: [PATCH] make ReadBookmarks() part of the nsIBookmarksService interface. I need this so I can call it from the profile code, so that after migration, the user has their 4.x bookmarks. one bug remains, is that when you call ReadBookmarks() more then once it should re-set the bookmarks, instead of adding to it. --- xpfe/components/bookmarks/public/nsIBookmarksService.idl | 1 + xpfe/components/bookmarks/src/nsBookmarksService.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xpfe/components/bookmarks/public/nsIBookmarksService.idl b/xpfe/components/bookmarks/public/nsIBookmarksService.idl index 98f5bc918ad9..2477f3da6c18 100644 --- a/xpfe/components/bookmarks/public/nsIBookmarksService.idl +++ b/xpfe/components/bookmarks/public/nsIBookmarksService.idl @@ -27,6 +27,7 @@ [scriptable, uuid(a82e9300-e4af-11d2-8fdf-0008c70adc7b)] interface nsIBookmarksService : nsISupports { + void ReadBookmarks(); void AddBookmark(in string aURI, in wstring aTitle); void UpdateBookmarkLastVisitedDate(in string aURL); string FindShortcut(in wstring aName); diff --git a/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 9a269959fb51..5429a2f90fc6 100644 --- a/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -1283,7 +1283,6 @@ nsresult ExamineBookmarkSchedule(nsIRDFResource *theBookmark, PRBool & examineFl nsresult GetBookmarkToPing(nsIRDFResource **theBookmark); nsresult GetBookmarksFile(nsFileSpec* aResult); - nsresult ReadBookmarks(); nsresult WriteBookmarks(nsIRDFDataSource *ds, nsIRDFResource *root); nsresult WriteBookmarksContainer(nsIRDFDataSource *ds, nsOutputFileStream strm, nsIRDFResource *container, PRInt32 level); nsresult GetTextForNode(nsIRDFNode* aNode, nsString& aResult); @@ -3139,7 +3138,7 @@ nsBookmarksService::GetBookmarksFile(nsFileSpec* aResult) return rv; } -nsresult +NS_IMETHODIMP nsBookmarksService::ReadBookmarks() { nsresult rv;