[Unison-hackers] [Patch] Compilation under Lion

Benjamin C. Pierce bcpierce at cis.upenn.edu
Sat Jan 21 12:47:40 EST 2012


Please do!

On Jan 21, 2012, at 12:44 PM, Alan Schmitt wrote:

> Unison crashes when compiled under Lion, because of problems with the toolbar. I applied the fix suggested in http://blitzbasic.com/Community/posts.php?topic=95778 to make it work.
> 
> I can commit this if you want.
> 
> Alan
> 
> Index: uimacnew09/UnisonToolbar.m
> ===================================================================
> --- uimacnew09/UnisonToolbar.m	(revision 480)
> +++ uimacnew09/UnisonToolbar.m	(working copy)
> @@ -153,12 +153,13 @@
> 	else if ([whichView isEqual: @"updatesView"]) {
> 		return [NSArray arrayWithObjects:   QuitItemIdentifier,
> 			RestartItemIdentifier, 
> -			NSToolbarSeparatorItemIdentifier,
> +			NSToolbarSpaceItemIdentifier,
> 			GoItemIdentifier,
> 			RescanItemIdentifier,
> -			NSToolbarSeparatorItemIdentifier,
> +			NSToolbarSpaceItemIdentifier,
> 			RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, 
> -			SkipItemIdentifier, NSToolbarSeparatorItemIdentifier,
> +			SkipItemIdentifier,
> +      NSToolbarSpaceItemIdentifier,
> 			DiffItemIdentifier, 
> 			TableModeIdentifier, nil];
> 	}
> @@ -177,14 +178,14 @@
> 	    GoItemIdentifier, RestartItemIdentifier, RescanItemIdentifier,
> 	    RToLItemIdentifier, MergeItemIdentifier, LToRItemIdentifier, 
> 	    SkipItemIdentifier, DiffItemIdentifier,
> -	    NSToolbarSeparatorItemIdentifier, nil];
> +	    NSToolbarSpaceItemIdentifier, nil];
> }
> 
> - (void) setView: (NSString *) whichView {
> 	if ([whichView isEqual:currentView]) return;
> 
> 	currentView = whichView;
> -
> +  
> 	int i;
> 	NSArray *identifiers;
> 	NSString *oldIdentifier;
> 
> _______________________________________________
> Unison-hackers mailing list
> Unison-hackers at lists.seas.upenn.edu
> http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers



More information about the Unison-hackers mailing list