adium 4365:b06ab45b7b91: Merging.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b06ab45b7b91
revision:	4365:b06ab45b7b91
branch:		EmoticonsMenu
author:		Adrian Godoroja <robotive at me.com>
date:		Sun Dec 11 18:37:51 2011 +0200

Merging.

diffs (40 lines):

diff -r dacc232a343c -r b06ab45b7b91 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Sat Dec 10 23:03:44 2011 +0200
+++ b/ChangeLogs/Changes Between Betas.txt	Sun Dec 11 18:37:51 2011 +0200
@@ -1,6 +1,8 @@
 Adium 1.5b8
  * Twitter: Use the non-truncated version of retweets if they are included. (#15226)
  * Fixed setting a global shortcut which used the letter "a". (#12013)
+ * Disabled elastic scroll in the text input of the message view.
+ * Disabled elastic scroll in Change User Picture Menu.
 
 Adium 1.5b7
  * Make sure nibs are not stripped so they can be localized.
diff -r dacc232a343c -r b06ab45b7b91 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sat Dec 10 23:03:44 2011 +0200
+++ b/ChangeLogs/Changes.txt	Sun Dec 11 18:37:51 2011 +0200
@@ -68,6 +68,7 @@
   * Added the "lastFocus" class for message styles to the latest message received while the chat didn't have focus, and "regainedFocus" for the first message received while the chat has regained focus after having previously lost it.
   * Made emoticons between packs more consistent. (#11450)
   * Fixed the ":^)" emoticon being mistakenly interpreted the same as ":-\". (#13924)
+  * Disabled elastic scroll of the text input, in Lion.
 
  Status
  * Added ability to change which track information the "iTunes" status displays. (#6373)
diff -r dacc232a343c -r b06ab45b7b91 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Sat Dec 10 23:03:44 2011 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Sun Dec 11 18:37:51 2011 +0200
@@ -800,6 +800,13 @@
 
 	[self _updateTextEntryViewHeight];
 	
+	// Disable elastic scroll
+	// Remove the check on 10.7+
+	// Not sure why it won't work in AIMessageEntryTextView
+	if ([[textView_outgoing enclosingScrollView] respondsToSelector:@selector(setVerticalScrollElasticity:)]) {
+		[[textView_outgoing enclosingScrollView] setVerticalScrollElasticity:1]; // Swap 1 with NSScrollElasticityNone on 10.7+
+	}
+	
 	// Enable emoticons menu
 	// This should be after all frame/bounds setups, or it will fail to display correctly
 	[textView_outgoing setHasEmoticonsMenu:YES];