Bug 9431. Don't return failure if can't find bookmarks file.

This commit is contained in:
waterson%netscape.com 1999-07-09 23:09:59 +00:00
Родитель 8cf5392331
Коммит fab7044180
1 изменённых файлов: 10 добавлений и 2 удалений

Просмотреть файл

@ -1548,7 +1548,11 @@ nsBookmarksService::ReadBookmarks()
nsFileSpec bookmarksFile;
rv = GetBookmarksFile(&bookmarksFile);
if (NS_FAILED(rv)) return rv;
// Oh well, couldn't get the bookmarks file. Guess there
// aren't any bookmarks to read in.
if (NS_FAILED(rv))
return NS_OK;
rv = gRDFC->MakeSeq(mInner, kNC_BookmarksRoot, nsnull);
NS_ASSERTION(NS_SUCCEEDED(rv), "Unable to make NC:BookmarksRoot a sequence");
@ -1682,7 +1686,11 @@ nsBookmarksService::WriteBookmarks(nsIRDFDataSource *ds, nsIRDFResource *root)
nsFileSpec bookmarksFile;
rv = GetBookmarksFile(&bookmarksFile);
if (NS_FAILED(rv)) return rv;
// Oh well, couldn't get the bookmarks file. Guess there
// aren't any bookmarks for us to write out.
if (NS_FAILED(rv))
return NS_OK;
rv = NS_ERROR_FAILURE;
nsOutputFileStream strm(bookmarksFile);