Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trying to fix bookmarks unit test -- null check bookmarksFile, xpcshell doesn't know about it.

Browse Source 
Original committer: bryner%brianryner.com
Original revision: 1.22
Original date: 2005/12/10 04:40:52
This commit is contained in:
benjamin%smedbergs.us 2006-07-18 14:35:15 +00:00
parent e9512dba96
commit aa2da84115
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
toolkit/components/places/src/nsNavBookmarks.cpp
View File

@ -268,18 +268,20 @@ nsNavBookmarks::InitRoots()
nsCOMPtr<nsIFile> bookmarksFile;
rv = NS_GetSpecialDirectory(NS_APP_BOOKMARKS_50_FILE,
getter_AddRefs(bookmarksFile));
PRBool bookmarksFileExists;
rv = bookmarksFile->Exists(&bookmarksFileExists);
if (NS_SUCCEEDED(rv) && bookmarksFileExists) {
nsCOMPtr<nsIIOService> ioservice = do_GetService(
if (bookmarksFile) {
PRBool bookmarksFileExists;
rv = bookmarksFile->Exists(&bookmarksFileExists);
if (NS_SUCCEEDED(rv) && bookmarksFileExists) {
nsCOMPtr<nsIIOService> ioservice = do_GetService(
"@mozilla.org/network/io-service;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> bookmarksFileURI;
rv = ioservice->NewFileURI(bookmarksFile,
getter_AddRefs(bookmarksFileURI));
NS_ENSURE_SUCCESS(rv, rv);
rv = ImportBookmarksHTMLInternal(bookmarksFileURI, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> bookmarksFileURI;
rv = ioservice->NewFileURI(bookmarksFile,
getter_AddRefs(bookmarksFileURI));
NS_ENSURE_SUCCESS(rv, rv);
rv = ImportBookmarksHTMLInternal(bookmarksFileURI, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
}
}
}
return NS_OK;