From 947d6ad28f52266a53f8df1dfe44f3f4f6d368a6 Mon Sep 17 00:00:00 2001 From: "stuart.morgan%alumni.case.edu" Date: Mon, 6 Nov 2006 16:13:04 +0000 Subject: [PATCH] Camino only - Bug 314628: check Use as Dock Menu on the current dock menu. r=cl sr=pink --- camino/src/bookmarks/BookmarkManager.mm | 2 ++ camino/src/bookmarks/BookmarkViewController.mm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/camino/src/bookmarks/BookmarkManager.mm b/camino/src/bookmarks/BookmarkManager.mm index 8d642297775d..1f6fc5989363 100644 --- a/camino/src/bookmarks/BookmarkManager.mm +++ b/camino/src/bookmarks/BookmarkManager.mm @@ -808,6 +808,8 @@ static BookmarkManager* gBookmarkManager = nil; menuTitle = NSLocalizedString(@"Use as Dock Menu", @""); menuItem = [[[NSMenuItem alloc] initWithTitle:menuTitle action:@selector(makeDockMenu:) keyEquivalent:@""] autorelease]; [menuItem setTarget:[items objectAtIndex:0]]; + if ([(BookmarkFolder*)[items objectAtIndex:0] isDockMenu]) + [menuItem setState:NSOnState]; [contextMenu addItem:menuItem]; } diff --git a/camino/src/bookmarks/BookmarkViewController.mm b/camino/src/bookmarks/BookmarkViewController.mm index f2fab872c17f..d6cd5c18f788 100644 --- a/camino/src/bookmarks/BookmarkViewController.mm +++ b/camino/src/bookmarks/BookmarkViewController.mm @@ -1433,6 +1433,8 @@ static const unsigned int TableViewSolidVerticalGridLineMask = 1; action:@selector(setAsDockMenuFolder:) keyEquivalent:@""]; [useAsDockItem setTarget:self]; + if ([aFolder isDockMenu]) + [useAsDockItem setState:NSOnState]; [contextMenu addItem:useAsDockItem]; [useAsDockItem release];