Skip to content
Browse files

Merge commit '624a9c9506e0743765fa3ce5ecae6c474335aa2b'

Conflicts:
	TerminalTabSwitching.m
  • Loading branch information...
2 parents 86a0680 + 624a9c9 commit 315c3e42d87d879a48423eebac392f55b830f5c1 @niw niw committed Jan 31, 2010
Showing with 8 additions and 1 deletion.
  1. +8 −1 TerminalTabSwitching.m
View
9 TerminalTabSwitching.m
@@ -54,6 +54,12 @@ - (void)TerminalTabSwitching_closeTab:(id)fp8
[self updateTabListMenu];
}
+- (void)TerminalTabSwitching_mergeAllWindows:(id)fp8
+{
+ [self TerminalTabSwitching_mergeAllWindows:fp8];
+ [self updateTabListMenu];
+}
+
- (void)selectRepresentedTabViewItem:(NSMenuItem*)item
{
NSTabViewItem* tabViewItem = [item representedObject];
@@ -71,6 +77,7 @@ + (void)load
[NSClassFromString(@"TTWindowController") jr_swizzleMethod:@selector(windowDidLoad) withMethod:@selector(TerminalTabSwitching_windowDidLoad) error:NULL];
[NSClassFromString(@"TTWindowController") jr_swizzleMethod:@selector(newTab:) withMethod:@selector(TerminalTabSwitching_newTab:) error:NULL];
[NSClassFromString(@"TTWindowController") jr_swizzleMethod:@selector(closeTab:) withMethod:@selector(TerminalTabSwitching_closeTab:) error:NULL];
+ [NSClassFromString(@"TTWindowController") jr_swizzleMethod:@selector(mergeAllWindows:) withMethod:@selector(TerminalTabSwitching_mergeAllWindows:) error:NULL];
NSApplication *app = [NSApplication sharedApplication];
NSWindow *mainWindow = [app mainWindow];
@@ -92,4 +99,4 @@ + (void)load
NSLog(@"TerminalTabSwitching installed");
}
-@end
+@end

0 comments on commit 315c3e4

Please sign in to comment.
Something went wrong with that request. Please try again.