Remove the HistoryDataSource instance from the nib, and instantiate it in code so that we can more clearly release it, fixing history leaks. No bug.

camino/resources/localized/English.lproj/BookmarksEditing.nib/info.nib

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>19 33 506 368 0 0 1600 1002 </string>
+	<string>19 32 506 368 0 0 1600 1002 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>116</key>
@@ -32,6 +32,6 @@
 	<key>IBFramework Version</key>
 	<string>364.0</string>
 	<key>IBSystem Version</key>
-	<string>7S215</string>
+	<string>7U16</string>
 </dict>
 </plist>

camino/src/bookmarks/BookmarkViewController.h

@@ -109,6 +109,8 @@
   BookmarkFolder*         mRootBookmarks;
   NSArray*                mSearchResultArray;
   int                     mOpenActionFlag;
+  
+  HistoryDataSource*      mHistoryDataSource;
 }
 
 + (NSAttributedString*)greyStringWithItemCount:(int)itemCount;

camino/src/bookmarks/BookmarkViewController.mm

@@ -169,6 +169,8 @@ static const int kDisabledQuicksearchPopupItemTag = 9999;
   [mBookmarksHostView release];
   [mHistoryHostView release];
   
+  [mHistoryDataSource release];
+
   [super dealloc];
 }
 
@@ -202,6 +204,8 @@ static const int kDisabledQuicksearchPopupItemTag = 9999;
   [self setupAppearanceOfTableView:mHistoryOutlineView];
 
   // set up history outliner
+  mHistoryDataSource = [[HistoryDataSource alloc] init];
+  [mHistoryOutlineView setDataSource:mHistoryDataSource];
   [mHistoryOutlineViewDelegate setBrowserWindowController:mBrowserWindowController];
   [mHistoryOutlineView setTarget:mHistoryOutlineViewDelegate];
   [mHistoryOutlineView setDoubleAction:@selector(openHistoryItem:)];