adium-1.4 3278:ad22153998f9: Renkoo: don't scroll down on new me...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/ad22153998f9
revision:	3278:ad22153998f9
author:		mathuaerknedam
date:		Wed Nov 17 16:18:40 2010 -0600

Renkoo: don't scroll down on new messages when scrolled up in the chat. Good find by kbotc. Fixes #14331.
Subject: adium-1.4 3279:18de5f703b00: Renkoo: increment version.

details:	http://hg.adium.im/adium-1.4/rev/18de5f703b00
revision:	3279:18de5f703b00
author:		mathuaerknedam
date:		Wed Nov 17 16:21:27 2010 -0600

Renkoo: increment version.

diffs (33 lines):

diff -r 40959126ec07 -r 18de5f703b00 Resources/Message Styles/Renkoo.AdiumMessageStyle/Contents/Info.plist
--- a/Resources/Message Styles/Renkoo.AdiumMessageStyle/Contents/Info.plist	Tue Nov 16 22:29:07 2010 -0600
+++ b/Resources/Message Styles/Renkoo.AdiumMessageStyle/Contents/Info.plist	Wed Nov 17 16:21:27 2010 -0600
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.6</string>
+	<string>2.6.1</string>
 	<key>OriginalAuthor</key>
 	<string>iTorrey</string>
 	<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>AdIM</string>
 	<key>CFBundleVersion</key>
-	<string>2.6</string>
+	<string>2.6.1</string>
 	<key>MessageViewVersion</key>
 	<integer>4</integer>
 	<key>XtraBundleVersion</key>
diff -r 40959126ec07 -r 18de5f703b00 Resources/Message Styles/Renkoo.AdiumMessageStyle/Contents/Resources/Footer.html
--- a/Resources/Message Styles/Renkoo.AdiumMessageStyle/Contents/Resources/Footer.html	Tue Nov 16 22:29:07 2010 -0600
+++ b/Resources/Message Styles/Renkoo.AdiumMessageStyle/Contents/Resources/Footer.html	Wed Nov 17 16:21:27 2010 -0600
@@ -216,7 +216,7 @@
 				}
 				fader.fadeIn();
 			}
-			alignChat(true);
+			alignChat(coalescedHTML.shouldScroll);
 		});
 	}