adium 3912:60ad2a994380: With this syntax, it will not compile i...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/60ad2a994380
revision:	3912:60ad2a994380
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue May 24 18:08:01 2011 +0200

With this syntax, it will not compile in Xcode 3.
Subject: adium 3913:86b61d53cdf0: Based on a patch from "zee", allow tab bar scrubbing to be disabled with defaults

details:	http://hg.adium.im/adium/rev/86b61d53cdf0
revision:	3913:86b61d53cdf0
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue May 24 18:13:18 2011 +0200

Based on a patch from "zee", allow tab bar scrubbing to be disabled with defaults

Fixes #15073

diffs (26 lines):

diff -r 61359dc577f7 -r 86b61d53cdf0 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m	Tue May 24 17:56:22 2011 +0200
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m	Tue May 24 18:13:18 2011 +0200
@@ -213,7 +213,8 @@
 	[tabView_tabBar setHideForSingleTab:!alwaysShowTabs];
 	[tabView_tabBar setSelectsTabsOnMouseDown:YES];
 	[tabView_tabBar setAutomaticallyAnimates:NO];
-	[tabView_tabBar setAllowsScrubbing:YES];
+	
+	[tabView_tabBar setAllowsScrubbing:![[NSUserDefaults standardUserDefaults] boolForKey:@"AIDisableScrubbing"]];
 	[tabView_tabBar setAllowsBackgroundTabClosing:[[NSUserDefaults standardUserDefaults] boolForKey:@"AIAllowBackgroundTabClosing"]];
 	[tabView_tabBar setTearOffStyle:PSMTabBarTearOffAlphaWindow];
 }
diff -r 61359dc577f7 -r 86b61d53cdf0 Source/ESAddressBookIntegrationAdvancedPreferences.m
--- a/Source/ESAddressBookIntegrationAdvancedPreferences.m	Tue May 24 17:56:22 2011 +0200
+++ b/Source/ESAddressBookIntegrationAdvancedPreferences.m	Tue May 24 18:13:18 2011 +0200
@@ -40,8 +40,7 @@
 }
 @end
 
- at interface ESAddressBookIntegrationAdvancedPreferences () {
-}
+ at interface ESAddressBookIntegrationAdvancedPreferences ()
 - (IBAction)changeFormat:(id)sender;
 - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
 - (NSArray *)separateStringIntoTokens:(NSString *)string;