We have to manually update items on the Bookmarks menu and its submenus, because we turn auto-enabling of items off for this menu (persumably, for performance with lots of bookmarks).

camino/BrowserWindowController.mm

@@ -117,15 +117,20 @@ static NSArray* sToolbarDefaults = nil;
   [[NSApp delegate] adjustCloseWindowMenuItemKeyEquivalent:NO];
 }
 
-/*
 - (void)windowDidBecomeMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:YES];
 }
 
 - (void)windowDidResignMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:NO];
 }
-*/
+
 
 -(void)mouseMoved:(NSEvent*)aEvent
 {

camino/src/browser/BrowserWindowController.mm

@@ -117,15 +117,20 @@ static NSArray* sToolbarDefaults = nil;
   [[NSApp delegate] adjustCloseWindowMenuItemKeyEquivalent:NO];
 }
 
-/*
 - (void)windowDidBecomeMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:YES];
 }
 
 - (void)windowDidResignMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:NO];
 }
-*/
+
 
 -(void)mouseMoved:(NSEvent*)aEvent
 {

chimera/BrowserWindowController.mm

@@ -117,15 +117,20 @@ static NSArray* sToolbarDefaults = nil;
   [[NSApp delegate] adjustCloseWindowMenuItemKeyEquivalent:NO];
 }
 
-/*
 - (void)windowDidBecomeMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:YES];
 }
 
 - (void)windowDidResignMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:NO];
 }
-*/
+
 
 -(void)mouseMoved:(NSEvent*)aEvent
 {

chimera/src/browser/BrowserWindowController.mm

@@ -117,15 +117,20 @@ static NSArray* sToolbarDefaults = nil;
   [[NSApp delegate] adjustCloseWindowMenuItemKeyEquivalent:NO];
 }
 
-/*
 - (void)windowDidBecomeMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:YES];
 }
 
 - (void)windowDidResignMain:(NSNotification *)notification
 {
+  // we have to manually enable/disable the bookmarks menu items, because we
+  // turn autoenabling off for that menu
+  [[NSApp delegate] adjustBookmarksMenuItemsEnabling:NO];
 }
-*/
+
 
 -(void)mouseMoved:(NSEvent*)aEvent
 {