Camino only - Bug 359907: Bookmarks aren't deleted from bookmarks menu after deletion from bookmark manager. r=hwaara sr=pink

git-svn-id: svn://10.0.0.236/trunk@215479 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
stuart.morgan%alumni.case.edu
2006-11-20 18:51:22 +00:00
parent df98bb7e2e
commit 32c7b10bbd

View File

@@ -301,6 +301,19 @@ const long kOpenInTabsTag = 0xBEEF;
- (void)bookmarkChanged:(NSNotification *)inNotification
{
BookmarkItem* changedItem = [inNotification object];
NSNumber* noteChangeFlags = [[inNotification userInfo] objectForKey:BookmarkItemChangedFlagsKey];
unsigned int changeFlags = kBookmarkItemEverythingChangedMask;
if (noteChangeFlags)
changeFlags = [noteChangeFlags unsignedIntValue];
// first, see if it's a notification that this folder's children have changed
if ((changedItem == mFolder) && (changeFlags & kBookmarkItemChildrenChangedMask)) {
mDirty = YES;
return;
}
// any other change is only interesting if it's to one of this folder's children
if ([changedItem parent] != mFolder)
return;
@@ -309,12 +322,6 @@ const long kOpenInTabsTag = 0xBEEF;
if (itemIndex == -1)
return;
unsigned int changeFlags = kBookmarkItemEverythingChangedMask;
NSNumber* noteChangeFlags = [[inNotification userInfo] objectForKey:BookmarkItemChangedFlagsKey];
if (noteChangeFlags)
changeFlags = [noteChangeFlags unsignedIntValue];
// if it changed to or from a separator (or everything changed), just do a rebuild later
if (changeFlags & kBookmarkItemStatusChangedMask) {
mDirty = YES;