adium 4328:12729561aef4: Clean up a lot of overincludes of <AIUt...

commits at adium.im commits at adium.im
Wed Nov 30 22:51:15 UTC 2011 

details:	http://hg.adium.im/adium/rev/12729561aef4
revision:	4328:12729561aef4
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Wed Nov 30 14:46:41 2011 -0800

Clean up a lot of overincludes of <AIUtilities/AIApplicationAdditions.h>
Subject: adium 4329:198733370475: Normal windows should behave normally, so only disable elastic scrolling when the contact list window isn't a normal window.

details:	http://hg.adium.im/adium/rev/198733370475
revision:	4329:198733370475
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Wed Nov 30 14:48:12 2011 -0800

Normal windows should behave normally, so only disable elastic scrolling when the contact list window isn't a normal window.
Subject: adium 4330:70aa3725c670: Fix a 2px clipping error in the normal contact list window. Related to #15626.

details:	http://hg.adium.im/adium/rev/70aa3725c670
revision:	4330:70aa3725c670
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Wed Nov 30 14:48:25 2011 -0800

Fix a 2px clipping error in the normal contact list window. Related to #15626.
Subject: adium 4331:a0c7b4aedc21: Changelogs

details:	http://hg.adium.im/adium/rev/a0c7b4aedc21
revision:	4331:a0c7b4aedc21
branch:		(none)
author:		Stephen Holt <sholt at adium.im>
date:		Wed Nov 30 14:51:03 2011 -0800

Changelogs

diffs (646 lines):

diff -r e389e9e45065 -r a0c7b4aedc21 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Tue Nov 29 23:56:27 2011 -0800
+++ b/ChangeLogs/Changes Between Betas.txt	Wed Nov 30 14:51:03 2011 -0800
@@ -1,7 +1,8 @@
 Adium 1.5b6
  * Fixed automatic updating between betas failing with the error "Can't make a temporary directory for the update download". (#15666)
  * Correct strange behavior in the messages pref pane. (#15670)
- * Fixed a 2px alignment issue when a borderless contact window is set to vertically resize automatically. (#15626)
+ * Fixed a 2px alignment issue when a normal or borderless contact window is set to vertically resize automatically. (#15626)
+ * Restored bouncy scroll behavior to normal window style contact list windows.
 
 Adium 1.5b5
  * Fixed crash when loading Skype plugin. (#15590)
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/AIUtilities Framework/Source/AISegmentedControl.m
--- a/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/AIUtilities Framework/Source/AISegmentedControl.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 
 #import "AISegmentedControl.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 
 @interface NSSegmentedCell (ApplePrivate)
 - (void)setMenuIndicatorShown:(BOOL)shown forSegment:(NSInteger)segment;
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIAbstractAccount.m
--- a/Frameworks/Adium Framework/Source/AIAbstractAccount.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIAbstractAccount.m	Wed Nov 30 14:51:03 2011 -0800
@@ -33,7 +33,6 @@
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIMutableOwnerArray.h>
 #import <AIUtilities/AIStringAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIDictionaryAdditions.h>
 #import <AIUtilities/AISystemNetworkDefaults.h>
 
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIAbstractListController.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -40,7 +40,6 @@
 #import <AIUtilities/AIColorAdditions.h>
 #import <AIUtilities/AIFontAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIOutlineViewAdditions.h>
 #import <AIUtilities/AIPasteboardAdditions.h>
 #import "AIMessageWindowController.h"
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIEditStateWindowController.m
--- a/Frameworks/Adium Framework/Source/AIEditStateWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIEditStateWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -24,7 +24,6 @@
 #import <AIUtilities/AIStringFormatter.h>
 #import <AIUtilities/AITextAttributes.h>
 #import <AIUtilities/AIWindowAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <Adium/AIMessageEntryTextView.h>
 
 #define CONTROL_SPACING			8
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIHTMLDecoder.m
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.m	Wed Nov 30 14:51:03 2011 -0800
@@ -20,7 +20,6 @@
 
 #import <Adium/AIHTMLDecoder.h>
 
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AITextAttributes.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIColorAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIListGroupCell.m
--- a/Frameworks/Adium Framework/Source/AIListGroupCell.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIListGroupCell.m	Wed Nov 30 14:51:03 2011 -0800
@@ -19,7 +19,6 @@
 #import <Adium/ESObjectWithProperties.h>
 #import <AIUtilities/AIColorAdditions.h>
 #import <AIUtilities/AIGradientAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIParagraphStyleAdditions.h>
 
 #define FLIPPY_TEXT_PADDING		4
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIListOutlineView.m
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.m	Wed Nov 30 14:51:03 2011 -0800
@@ -21,7 +21,6 @@
 #import <Adium/AIListContact.h>
 #import <Adium/AIProxyListObject.h>
 #import <AIUtilities/AIWindowAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIOutlineViewAdditions.h>
 #import <AIUtilities/AIBezierPathAdditions.h>
 #import <AIUtilities/AIEventAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIMessageEntryTextView.m
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.m	Wed Nov 30 14:51:03 2011 -0800
@@ -27,7 +27,6 @@
 #import <Adium/AIInterfaceControllerProtocol.h>
 #import <Adium/AIContentContext.h>
 
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIColorAdditions.h>
 #import <AIUtilities/AITextAttributes.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/AIWindowController.m
--- a/Frameworks/Adium Framework/Source/AIWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -15,7 +15,6 @@
  */
 
 #import <Adium/AIWindowController.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIWindowAdditions.h>
 #import <AIUtilities/AIWindowControllerAdditions.h>
 
diff -r e389e9e45065 -r a0c7b4aedc21 Frameworks/Adium Framework/Source/ESContactAlertsViewController.m
--- a/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -24,7 +24,6 @@
 #import <AIUtilities/AIImageTextCell.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIVariableHeightFlexibleColumnsOutlineView.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIArrayAdditions.h>
 #import <AIUtilities/AIScaledImageCell.h>
 #import <AIUtilities/AIVerticallyCenteredTextCell.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -23,7 +23,6 @@
 #import "AIDockController.h"
 #import <Adium/AIToolbarControllerProtocol.h>
 #import <Adium/AIAccountControllerProtocol.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Error Message Handler/ErrorMessageWindowController.m
--- a/Plugins/Error Message Handler/ErrorMessageWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Error Message Handler/ErrorMessageWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -15,7 +15,6 @@
  */
 
 #import "ErrorMessageWindowController.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 
 #define MAX_ERRORS			80				//The max # of errors to display
 #define MAX_ERROR_FRAME_HEIGHT	300
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Link Management/SHLinkEditorWindowController.m
--- a/Plugins/Link Management/SHLinkEditorWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Link Management/SHLinkEditorWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -17,7 +17,6 @@
 #import "SHLinkEditorWindowController.h"
 #import "SHAutoValidatingTextView.h"
 #import <AutoHyperlinks/AHLinkLexer.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIAutoScrollView.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Link Management/SHLinkManagementPlugin.m
--- a/Plugins/Link Management/SHLinkManagementPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Link Management/SHLinkManagementPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -24,7 +24,6 @@
 #import <AIUtilities/AIToolbarUtilities.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIWindowAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 
 #define ADD_LINK_TITLE			[AILocalizedString(@"Add Link",nil) stringByAppendingEllipsis]
 #define EDIT_LINK_TITLE			[AILocalizedString(@"Edit Link",nil) stringByAppendingEllipsis]
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Purple Service/CBPurpleAccount.m	Wed Nov 30 14:51:03 2011 -0800
@@ -51,7 +51,6 @@
 #import <AIUtilities/AIMenuAdditions.h>
 #import <AIUtilities/AIMutableOwnerArray.h>
 #import <AIUtilities/AIStringAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIObjectAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIImageDrawingAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m	Wed Nov 30 14:51:03 2011 -0800
@@ -27,7 +27,6 @@
 #import <Adium/AIStatusIcons.h>
 #import <Adium/ESFileTransfer.h>
 #import <Adium/AIService.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIDictionaryAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Purple Service/adiumPurpleCore.m
--- a/Plugins/Purple Service/adiumPurpleCore.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Purple Service/adiumPurpleCore.m	Wed Nov 30 14:51:03 2011 -0800
@@ -33,10 +33,9 @@
 
 #import <AdiumLibpurple/SLPurpleCocoaAdapter.h>
 #import "AILibpurplePlugin.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIFileManagerAdditions.h>
 #import <Adium/AIAccountControllerProtocol.h>
-
+#import <AIUtilities/AIApplicationAdditions.h>
 
 #warning This include and the jabber_auth_add_mech() will be part of the FacebookXMPP account's initialization
 #import "auth.h"
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Purple Service/adiumPurpleEventloop.m
--- a/Plugins/Purple Service/adiumPurpleEventloop.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Purple Service/adiumPurpleEventloop.m	Wed Nov 30 14:51:03 2011 -0800
@@ -15,7 +15,6 @@
  */
 
 #import "adiumPurpleEventloop.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <poll.h>
 #import <unistd.h>
 #import <sys/socket.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Status Menu Item/CBStatusMenuItemController.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Status Menu Item/CBStatusMenuItemController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -23,7 +23,6 @@
 #import "CBStatusMenuItemPlugin.h"
 #import "CBStatusMenuItemController.h"
 #import "AIMenuBarIcons.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIMenuAdditions.h>
 #import <AIUtilities/AIEventAdditions.h>
 #import <AIUtilities/AIArrayAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Status Menu Item/CBStatusMenuItemPlugin.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Status Menu Item/CBStatusMenuItemPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 #import "CBStatusMenuItemPlugin.h"
 #import <AIUtilities/AIDictionaryAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 
 @interface CBStatusMenuItemPlugin()
 - (void)adiumFinishedLaunching:(NSNotification *)notification;
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m	Wed Nov 30 14:51:03 2011 -0800
@@ -21,7 +21,6 @@
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
 #import <AIUtilities/AIMenuAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIDateFormatterAdditions.h>
 #import <Adium/AIChatControllerProtocol.h>
 #import <Adium/AIContentControllerProtocol.h>
@@ -40,6 +39,7 @@
 #import <Adium/AIStatus.h>
 #import <Adium/AIHTMLDecoder.h>
 #import <Adium/AIContentEvent.h>
+#import <AIUtilities/AIApplicationAdditions.h>
 
 @interface AITwitterAccount()
 - (void)updateUserIcon:(NSString *)url forContact:(AIListContact *)listContact;
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -19,7 +19,6 @@
 #import "AIWebKitMessageViewPlugin.h"
 #import "ESWebKitMessageViewPreferences.h"
 #import <AIUtilities/AIDictionaryAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIBundleAdditions.h>
 #import "AIWebkitMessageViewStyle.h"
 #import <Adium/AIChat.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m	Wed Nov 30 14:51:03 2011 -0800
@@ -35,7 +35,6 @@
 #import <Adium/AIServiceIcons.h>
 #import <Adium/AIContentControllerProtocol.h>
 #import <Adium/AIStatusIcons.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 
 //
 #define LEGACY_VERSION_THRESHOLD		3	//Styles older than this version are considered legacy
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIAdium.m
--- a/Source/AIAdium.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIAdium.m	Wed Nov 30 14:51:03 2011 -0800
@@ -43,7 +43,6 @@
 #import "AIAppearancePreferences.h"
 #import <Adium/AIPathUtilities.h>
 #import <AIUtilities/AIFileManagerAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AISharedWriterQueue.h>
 #import <Adium/AIListContact.h>
 #import <Adium/AIService.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIAnimatingListOutlineView.m
--- a/Source/AIAnimatingListOutlineView.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIAnimatingListOutlineView.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 #import "AIAnimatingListOutlineView.h"
 #import "AIOutlineViewAnimation.h"
-#import "AIApplicationAdditions.h"
 
 #define DISABLE_ALL_ANIMATION				FALSE
 #define DISABLE_ANIMATE_EXPAND_AND_COLLAPSE	TRUE
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIBorderlessListOutlineView.m
--- a/Source/AIBorderlessListOutlineView.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIBorderlessListOutlineView.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 #import "AIBorderlessListOutlineView.h"
 #import <AIUtilities/AIEventAdditions.h>
-#import "AIApplicationAdditions.h"
 
 #define FORCED_MINIMUM_HEIGHT 20
 
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIContactController.m
--- a/Source/AIContactController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIContactController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -31,7 +31,6 @@
 #import <AIUtilities/AIFileManagerAdditions.h>
 #import <AIUtilities/AIMenuAdditions.h>
 #import <AIUtilities/AIToolbarUtilities.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
 #import <Adium/AIAccount.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIContactInfoWindowController.m
--- a/Source/AIContactInfoWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIContactInfoWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -25,7 +25,6 @@
 #import <Adium/AIListObject.h>
 #import <Adium/AIListOutlineView.h>
 #import <Adium/AIService.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIDictionaryAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIImageViewWithImagePicker.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIContactListImagePicker.m
--- a/Source/AIContactListImagePicker.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIContactListImagePicker.m	Wed Nov 30 14:51:03 2011 -0800
@@ -20,7 +20,6 @@
 #import <Adium/AIContactControllerProtocol.h>
 #import "AIContactListUserPictureMenuController.h"
 #import <AIUtilities/AIBezierPathAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 
 #define ARROW_WIDTH		8
 #define ARROW_HEIGHT	(ARROW_WIDTH/2.0)
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIContactListUserPictureMenuController.m
--- a/Source/AIContactListUserPictureMenuController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIContactListUserPictureMenuController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -21,7 +21,6 @@
 #import "AIStandardListWindowController.h"
 #import "AIContactListImagePicker.h"
 #import <Adium/AIAccount.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIMenuAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIDockController.m
--- a/Source/AIDockController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIDockController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -20,11 +20,11 @@
 #import <Adium/AIInterfaceControllerProtocol.h>
 #import <AIUtilities/AIDictionaryAdditions.h>
 #import <AIUtilities/AIFileManagerAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <Adium/AIChatControllerProtocol.h>
 #import <Adium/AIIconState.h>
 #import <Adium/AIChat.h>
 #import <Adium/AIStatusControllerProtocol.h>
+#import <AIUtilities/AIApplicationAdditions.h>
 
 #define DOCK_DEFAULT_PREFS			@"DockPrefs"
 #define ICON_DISPLAY_DELAY			0.1
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIListWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -25,7 +25,6 @@
 #import <AIUtilities/AIWindowAdditions.h>
 #import <AIUtilities/AIFunctions.h>
 #import <AIUtilities/AIWindowControllerAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIOutlineViewAdditions.h>
 #import <Adium/AIListBookmark.h>
@@ -52,6 +51,10 @@
 
 #define SNAP_DISTANCE							15.0f /* Distance beween one window's edge and another's at which they should snap together */
 
+ at interface NSScrollView (AIListWindowController_LionCompatability)
+- (void)setVerticalScrollElasticity:(NSInteger)elasticity;
+ at end
+
 @interface AIListWindowController ()
 - (id)initWithContactList:(id<AIContainingObject>)contactList;
 + (NSString *)nibName;
@@ -175,13 +178,6 @@
 																	  inOutlineView:contactListView
 																	   inScrollView:scrollView_contactList 
 																		   delegate:self];
-	
-	/* Avoid the bouncing effect when scrolling on Lion. This looks very bad when using a borderless window.
-	 * TODO: (10.7+) remove this if
-	 */
-	if ([scrollView_contactList respondsToSelector:@selector(setVerticalScrollElasticity:)]) {
-		[scrollView_contactList setVerticalScrollElasticity:1]; // NSScrollElasticityNone
-	}
 
 	//super's windowDidLoad will restore our location, which is based upon the contactListRoot
 	[super windowDidLoad];
@@ -381,7 +377,14 @@
 			case AIContactListWindowStyleContactBubbles_Fitted:
 				//The bubbles styles don't show a window; force them to autosize by leaving autoResizeVertically == YES
 				break;
-		}			
+		}
+		
+		/* Avoid the bouncing effect when scrolling on Lion. This looks very bad when using a borderless window.
+		 * TODO: (10.7+) remove this if
+		 */
+		if (windowStyle != AIContactListWindowStyleStandard && [scrollView_contactList respondsToSelector:@selector(setVerticalScrollElasticity:)]) {
+			[scrollView_contactList setVerticalScrollElasticity:1]; // NSScrollElasticityNone
+		}
 
 		if (autoResizeHorizontally) {
 			//If autosizing, KEY_LIST_LAYOUT_HORIZONTAL_WIDTH determines the maximum width; no forced width.
@@ -450,7 +453,12 @@
 		[contactListController setForcedWindowWidth:forcedWindowWidth];
 		[contactListController setMaxWindowWidth:maxWindowWidth];
 		
-		[contactListController contactListDesiredSizeChanged];
+		// let this happen at the beginning of the next runloop. The View needs to configure itself before we start forcing it to a size.
+		dispatch_async(dispatch_get_main_queue(), ^{
+			NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+			[contactListController contactListDesiredSizeChanged];
+			[pool release];
+		});
 		
 		if (!firstTime) {
 			shouldRevealWindowAndDelaySliding = YES;
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AILogDateFormatter.m
--- a/Source/AILogDateFormatter.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AILogDateFormatter.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 #import "AILogDateFormatter.h"
 #import "AICalendarDate.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 
 @implementation AILogDateFormatter
 
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AILoggerPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -44,14 +44,11 @@
 #import <AIUtilities/AIMenuAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
 #import <AIUtilities/AIToolbarUtilities.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIDateFormatterAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/NSCalendarDate+ISO8601Unparsing.h>
 #import <AIUtilities/NSCalendarDate+ISO8601Parsing.h>
 
-#import <AIUtilities/AIApplicationAdditions.h>
-
 #import <libkern/OSAtomic.h>
 
 #import "AILogFileUpgradeWindowController.h"
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIMessageWindow.m
--- a/Source/AIMessageWindow.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIMessageWindow.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 #import "AIMessageWindow.h"
 #import "AIClickThroughThemeDocumentButton.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 #import "AIMessageWindowController.h"
 #import "AIInterfaceControllerProtocol.h"
 
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIPreferenceContainer.m
--- a/Source/AIPreferenceContainer.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIPreferenceContainer.m	Wed Nov 30 14:51:03 2011 -0800
@@ -18,7 +18,6 @@
 #import "AIPreferenceController.h"
 #import <Adium/AIListObject.h>
 #import <Adium/AILoginControllerProtocol.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIDictionaryAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
 #import <Adium/AIAccount.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIPreferenceController.m
--- a/Source/AIPreferenceController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIPreferenceController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -22,7 +22,6 @@
 #import <Adium/AIToolbarControllerProtocol.h>
 
 #import "AIPreferenceWindowController.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIDictionaryAdditions.h>
 #import <AIUtilities/AIFileManagerAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AISearchFieldCell.m
--- a/Source/AISearchFieldCell.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AISearchFieldCell.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 #import "AISearchFieldCell.h"
 #import <AIUtilities/AIBezierPathAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 
 @implementation AISearchFieldCell
 
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AIStandardListScrollView.m
--- a/Source/AIStandardListScrollView.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AIStandardListScrollView.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,6 +16,7 @@
 
 #import "AIStandardListScrollView.h"
 #import "AIApplicationAdditions.h"
+#import <AIUtilities/AIApplicationAdditions.h>
 
 @implementation AIStandardListScrollView
 
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AITextColorPreviewView.m
--- a/Source/AITextColorPreviewView.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AITextColorPreviewView.m	Wed Nov 30 14:51:03 2011 -0800
@@ -16,7 +16,6 @@
 
 #import "AITextColorPreviewView.h"
 #import <AIUtilities/AIParagraphStyleAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 
 @interface AITextColorPreviewView ()
 - (void)_initTextColorPreviewView;
diff -r e389e9e45065 -r a0c7b4aedc21 Source/AdiumPasswords.m
--- a/Source/AdiumPasswords.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/AdiumPasswords.m	Wed Nov 30 14:51:03 2011 -0800
@@ -24,8 +24,6 @@
 #import <AIUtilities/AIStringAdditions.h>
 #import <objc/objc-runtime.h>
 
-#import <AIUtilities/AIApplicationAdditions.h>
-
 #import "AISpecialPasswordPromptController.h"
 #import "ESAccountPasswordPromptController.h"
 #import "ESProxyPasswordPromptController.h"
diff -r e389e9e45065 -r a0c7b4aedc21 Source/BGEmoticonMenuPlugin.m
--- a/Source/BGEmoticonMenuPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/BGEmoticonMenuPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -20,7 +20,6 @@
 #import "BGEmoticonMenuPlugin.h"
 #import <AIUtilities/AIMenuAdditions.h>
 #import <AIUtilities/AIToolbarUtilities.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIImageDrawingAdditions.h>
 #import <AIUtilities/MVMenuButton.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/ESAwayStatusWindowController.m
--- a/Source/ESAwayStatusWindowController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/ESAwayStatusWindowController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -21,7 +21,6 @@
 #import <Adium/AIStatus.h>
 #import <Adium/AIStatusIcons.h>
 #import <Adium/AIServiceIcons.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIArrayAdditions.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIImageTextCell.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/ESFileTransferRequestPromptController.m
--- a/Source/ESFileTransferRequestPromptController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/ESFileTransferRequestPromptController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -19,7 +19,6 @@
 #import "ESFileTransfer.h"
 #import <Adium/AIListContact.h>
 #import <Adium/AIContentControllerProtocol.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
 
diff -r e389e9e45065 -r a0c7b4aedc21 Source/ESGlobalEventsPreferences.m
--- a/Source/ESGlobalEventsPreferences.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/ESGlobalEventsPreferences.m	Wed Nov 30 14:51:03 2011 -0800
@@ -25,7 +25,6 @@
 #import <AIUtilities/AIMenuAdditions.h>
 #import <AIUtilities/AIPopUpButtonAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIVariableHeightOutlineView.h>
 #import <AIUtilities/AIVerticallyCenteredTextCell.h>
 #import <AIUtilities/AIAttributedStringAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/ESUserIconHandlingPlugin.m
--- a/Source/ESUserIconHandlingPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/ESUserIconHandlingPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -20,7 +20,6 @@
 #import <Adium/AIInterfaceControllerProtocol.h>
 #import <Adium/AIToolbarControllerProtocol.h>
 #import "ESUserIconHandlingPlugin.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIFileManagerAdditions.h>
 #import <AIUtilities/AIMutableOwnerArray.h>
 #import <AIUtilities/AIToolbarUtilities.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/LNAboutBoxController.m
--- a/Source/LNAboutBoxController.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/LNAboutBoxController.m	Wed Nov 30 14:51:03 2011 -0800
@@ -18,8 +18,8 @@
 #import "LNAboutBoxController.h"
 #import <AIUtilities/AIEventAdditions.h>
 #import <AIUtilities/AIWindowAdditions.h>
+#import <AIUtilities/AIDateFormatterAdditions.h>
 #import <AIUtilities/AIApplicationAdditions.h>
-#import <AIUtilities/AIDateFormatterAdditions.h>
 
 #define ABOUT_BOX_NIB		@"AboutBox"
 #define	ADIUM_SITE_LINK		AILocalizedString(@"http://www.adium.im","Adium homepage. Only localize if a translated version of the page exists.")
diff -r e389e9e45065 -r a0c7b4aedc21 Source/NEHGrowlPlugin.m
--- a/Source/NEHGrowlPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/NEHGrowlPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -31,7 +31,6 @@
 #import <Adium/AIServiceIcons.h>
 #import <Adium/AIStatus.h>
 #import <Adium/ESFileTransfer.h>
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIImageAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>
 #import <AIUtilities/AIMutableStringAdditions.h>
diff -r e389e9e45065 -r a0c7b4aedc21 Source/OWSpellingPerContactPlugin.m
--- a/Source/OWSpellingPerContactPlugin.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/OWSpellingPerContactPlugin.m	Wed Nov 30 14:51:03 2011 -0800
@@ -18,8 +18,6 @@
 #import <Adium/AIChat.h>
 #import <Adium/AIListContact.h>
 
-#import <AIUtilities/AIApplicationAdditions.h>
-
 #define GROUP_LAST_USED_SPELLING	@"Last Used Spelling"
 #define KEY_LAST_USED_SPELLING		@"Last Used Spelling Languge"
 
diff -r e389e9e45065 -r a0c7b4aedc21 Source/XtrasInstaller.m
--- a/Source/XtrasInstaller.m	Tue Nov 29 23:56:27 2011 -0800
+++ b/Source/XtrasInstaller.m	Wed Nov 30 14:51:03 2011 -0800
@@ -15,7 +15,6 @@
  */
 
 #import "XtrasInstaller.h"
-#import <AIUtilities/AIApplicationAdditions.h>
 #import <AIUtilities/AIBundleAdditions.h>
 #import <AIUtilities/AIStringAdditions.h>

More information about the commits mailing list