Fix bug # 50057: initial bookmarks menu problem with IE Favorites on Mac. r=me

This commit is contained in:
rjc%netscape.com 2000-09-04 22:52:30 +00:00
Родитель 63c72036b9
Коммит cd73214bca
1 изменённых файлов: 23 добавлений и 3 удалений

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

@ -205,14 +205,34 @@ public:
nsIRDFResource* property,
nsIRDFNode* target,
PRBool tv,
PRBool* hasAssertion) {
PRBool* hasAssertion)
{
#ifdef XP_MAC
// on the Mac, IE favorites are stored in an HTML file.
// Defer importing this files contents until necessary.
if ((source == kNC_IEFavoritesRoot) && (mIEFavoritesAvailable == PR_FALSE))
{
ReadFavorites();
}
#endif
return mInner->HasAssertion(source, property, target, tv, hasAssertion);
}
NS_IMETHOD AddObserver(nsIRDFObserver* aObserver);
NS_IMETHOD RemoveObserver(nsIRDFObserver* aObserver);
NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, PRBool *_retval) {
NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, PRBool *_retval)
{
#ifdef XP_MAC
// on the Mac, IE favorites are stored in an HTML file.
// Defer importing this files contents until necessary.
if ((aNode == kNC_IEFavoritesRoot) && (mIEFavoritesAvailable == PR_FALSE))
{
ReadFavorites();
}
#endif
return mInner->HasArcIn(aNode, aArc, _retval);
}
@ -223,7 +243,7 @@ public:
if ((aSource == kNC_IEFavoritesRoot) && (mIEFavoritesAvailable == PR_FALSE))
{
ReadFavorites();
ReadFavorites();
}
#endif
return mInner->HasArcOut(aSource, aArc, _retval);