fix bug 248720 - tabs do not change properly to reflect a new tab set. sr=pinkerton

camino/src/application/MainController.mm

@@ -404,7 +404,7 @@ const int kReuseWindowOnAE = 2;
     else if (openInNewTab)
       [browserWindowController openURLArray:[(BookmarkFolder *)item childURLs] replaceExistingTabs:NO];
     else
-      [browserWindowController openURLArray:[(BookmarkFolder *)item childURLs] replaceExistingTabs:YES];
+      [browserWindowController openURLArrayReplacingTabs:[(BookmarkFolder *)item childURLs] closeExtraTabs:[item isGroup]];
   }
 }
 

camino/src/browser/BrowserWindowController.h

@@ -286,6 +286,7 @@ typedef enum
 - (void)openNewTabWithURL: (NSString*)aURLSpec referrer: (NSString*)aReferrer loadInBackground: (BOOL)aLoadInBG;
 
 - (void)openURLArray:(NSArray*)urlArray replaceExistingTabs:(BOOL)replaceExisting;
+- (void)openURLArrayReplacingTabs:(NSArray*)urlArray closeExtraTabs:(BOOL)closeExtra;
 
 -(BrowserTabViewItem*)createNewTabItem;
 

camino/src/browser/BrowserWindowController.mm

@@ -2571,6 +2571,18 @@ enum BWCOpenDest {
   [mTabBrowser selectTabViewItemAtIndex:replaceExisting ? 0 : curNumTabs];
 }
 
+-(void) openURLArrayReplacingTabs:(NSArray*)urlArray closeExtraTabs:(BOOL)closeExtra
+{
+  [self openURLArray:urlArray replaceExistingTabs:YES];
+  if (closeExtra) {
+    int closeIndex = [urlArray count];
+    int closeCount = [mTabBrowser numberOfTabViewItems] - closeIndex;
+    for (int i = 0; i < closeCount; i++) {
+      [[mTabBrowser tabViewItemAtIndex:closeIndex] closeTab];
+    }
+  }
+}
+
 -(BrowserTabViewItem*)createNewTabItem
 {
   BrowserTabViewItem* newTab = [BrowserTabView makeNewTabItem];