From 073f62a90381078bdf093cdb34b01188adf9a8eb Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Fri, 25 Apr 2003 17:57:13 +0000 Subject: [PATCH] correctly enable get-info menu item --- camino/src/browser/BrowserWindowController.mm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index ac4f4f8e10c..d8281d9d599 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -1337,9 +1337,7 @@ static NSArray* sToolbarDefaults = nil; - (BOOL)bookmarksAreVisible:(BOOL)inRequireSelection { - // we should really identify the tab by identifier, not index. - BOOL bookmarksShowing = ([mSidebarDrawer state] == NSDrawerOpenState) && - ([mSidebarTabView tabViewItemAtIndex: 0] == [mSidebarTabView selectedTabViewItem]); + BOOL bookmarksShowing = [mContentView isBookmarkManagerVisible]; if (inRequireSelection) bookmarksShowing &= ([mSidebarBookmarksDataSource haveSelectedRow]); @@ -2341,14 +2339,14 @@ static NSArray* sToolbarDefaults = nil; - (void)toggleBookmarkManager:(id)sender { // deactivate any gecko view that might think it has focus - if ([self isResponderGeckoView:[[self window] firstResponder]]) { + if ([self isResponderGeckoView:[[self window] firstResponder]]) { CHBrowserView* browserView = [mBrowserView getBrowserView]; if (browserView) [browserView setActive:NO]; } // swap out between content and bookmarks. - [mContentView toggleBookmarkManager:sender]; + [mContentView toggleBookmarkManager:sender]; // if we're now showing the bm manager, force it to have focus, // otherwise give focus back to gecko.