From cf2a63cabc0ce12ee1da6c29d21c7cbf2f38c172 Mon Sep 17 00:00:00 2001 From: "stridey%gmail.com" Date: Sat, 7 Apr 2007 15:56:21 +0000 Subject: [PATCH] Camino only - Bug 374417: Disable 'Use in Dock Menu' context menu item for the History collection. r=murph sr=smorgan git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@224298 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/bookmarks/BookmarkViewController.mm | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/mozilla/camino/src/bookmarks/BookmarkViewController.mm b/mozilla/camino/src/bookmarks/BookmarkViewController.mm index f44cfca636f..34ce2c5e30d 100644 --- a/mozilla/camino/src/bookmarks/BookmarkViewController.mm +++ b/mozilla/camino/src/bookmarks/BookmarkViewController.mm @@ -1376,15 +1376,19 @@ const int kOutlineViewLeftMargin = 19; // determined empirically, since it doesn if ([aTableView numberOfSelectedRows] > 0) { BookmarkFolder* aFolder = [mRootBookmarks objectAtIndex:rowIndex]; - [contextMenu addItem:[NSMenuItem separatorItem]]; - NSMenuItem* useAsDockItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Use as Dock Menu", nil) - action:@selector(toggleIsDockMenuFolder:) - keyEquivalent:@""]; - [useAsDockItem setTarget:self]; - if ([aFolder isDockMenu]) - [useAsDockItem setState:NSOnState]; - [contextMenu addItem:useAsDockItem]; - [useAsDockItem release]; + // Create and add the "Use as Dock Menu" menu item for every collection but history + if (aFolder != [[BookmarkManager sharedBookmarkManager] historyFolder]) { + [contextMenu addItem:[NSMenuItem separatorItem]]; + + NSMenuItem* useAsDockItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Use as Dock Menu", nil) + action:@selector(toggleIsDockMenuFolder:) + keyEquivalent:@""]; + [useAsDockItem setTarget:self]; + if ([aFolder isDockMenu]) + [useAsDockItem setState:NSOnState]; + [contextMenu addItem:useAsDockItem]; + [useAsDockItem release]; + } if ([[BookmarkManager sharedBookmarkManager] isUserCollection:aFolder]) { NSMenuItem* deleteItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Delete", nil)