From 72095cce4355a20e35309da7abaed38d543da3d7 Mon Sep 17 00:00:00 2001 From: "rjc%netscape.com" Date: Wed, 4 Sep 2002 01:14:09 +0000 Subject: [PATCH] Fix bug # 145858 - imported bookmarked issue with NetPositive. Change required to old bug fix to get search results resolving correctly with aggregation. r=sergei_d@fi.tartu.ee sr=darin git-svn-id: svn://10.0.0.236/trunk@128787 18797224-902f-48f8-a5cc-f745e15eee43 --- .../bookmarks/src/nsBookmarksService.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 98d8430c21b..0b63688c274 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -3079,25 +3079,26 @@ nsBookmarksService::GetSynthesizedType(nsIRDFResource *aNode, nsIRDFNode **aType // (which is either a bookmark or a bookmark folder, since everything // else is annotated) PRBool isContainer = PR_FALSE; + PRBool isBookmarkedFlag = PR_FALSE; (void)gRDFC->IsSeq(mInner, aNode, &isContainer); if (isContainer) { *aType = kNC_Folder; } + else if (NS_SUCCEEDED(rv = IsBookmarkedInternal(aNode, + &isBookmarkedFlag)) && (isBookmarkedFlag == PR_TRUE)) + { + *aType = kNC_Bookmark; + } +#ifdef XP_BEOS else { -#ifdef XP_BEOS //solution for BeOS - bookmarks are stored as file attributes. - PRBool isBookmarkedFlag = PR_FALSE; - rv = IsBookmarkedInternal(aNode, &isBookmarkedFlag); - if (!isBookmarkedFlag || NS_FAILED(rv) || (rv == NS_RDF_NO_VALUE)) - *aType = kNC_URL; - else -#endif - *aType = kNC_Bookmark; + *aType = kNC_URL; } - NS_ADDREF(*aType); +#endif + NS_IF_ADDREF(*aType); } return(NS_OK); }