adium 4441:f1045766a3ec: Don't make the message entry area huge ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/f1045766a3ec
revision:	4441:f1045766a3ec
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Tue Jan 03 23:34:03 2012 -0500

Don't make the message entry area huge when the user hasn't set a preference for its size yet.
Subject: adium 4442:32ace0dce137: Changelog updates.

details:	http://hg.adium.im/adium/rev/32ace0dce137
revision:	4442:32ace0dce137
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Tue Jan 03 23:54:12 2012 -0500

Changelog updates.
Subject: adium 4443:7dacc933b805: Fix a missed case in 188f837e19eb, logging enabled without chat context being enabled. Refs #15133.

details:	http://hg.adium.im/adium/rev/7dacc933b805
revision:	4443:7dacc933b805
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Wed Jan 04 00:01:47 2012 -0500

Fix a missed case in 188f837e19eb, logging enabled without chat context being enabled. Refs #15133.

diffs (72 lines):

diff -r 26a31e2dd111 -r 7dacc933b805 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Tue Jan 03 22:31:15 2012 -0500
+++ b/ChangeLogs/Changes Between Betas.txt	Wed Jan 04 00:01:47 2012 -0500
@@ -1,6 +1,11 @@
 Adium 1.5b9
  * Made additional strings localisable
  * Updated localisations: French (#15734), German (#15586, #15658), Portuguese (Portugal) (#15721), Swedish (#15726).
+ * Fix the contact list not remembering its position on Lion (#15341) and (#15480).
+ * Fixed the message entry area being very large when Adium is first run.
+ * Fix display of Google+ users that don't reveal their email address.
+ * Fix some display issues with the user list when resizing a small chat window (#15577).
+ * Make some labels look enabled/disabled like their respective checkbokes (#15133).
 
 Adium 1.5b8
  General
diff -r 26a31e2dd111 -r 7dacc933b805 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Tue Jan 03 22:31:15 2012 -0500
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Wed Jan 04 00:01:47 2012 -0500
@@ -780,8 +780,9 @@
 	
 	//User's choice of mininum height for their text entry view
 	entryMinHeight = [[adium.preferenceController preferenceForKey:KEY_ENTRY_TEXTVIEW_MIN_HEIGHT
-															   group:PREF_GROUP_DUAL_WINDOW_INTERFACE] doubleValue];
-	if (entryMinHeight <= 0) entryMinHeight = AIfloor([self _textEntryViewProperHeightIgnoringUserMininum:YES] + 0.5f);
+															 group:PREF_GROUP_DUAL_WINDOW_INTERFACE] doubleValue];
+	if (entryMinHeight <= 0)
+		entryMinHeight = ENTRY_TEXTVIEW_MIN_HEIGHT;
 	
 	//Associate the view with our message view so it knows which view to scroll in response to page up/down
 	//and other special key-presses.
diff -r 26a31e2dd111 -r 7dacc933b805 Resources/en.lproj/GeneralPreferences.nib/designable.nib
--- a/Resources/en.lproj/GeneralPreferences.nib/designable.nib	Tue Jan 03 22:31:15 2012 -0500
+++ b/Resources/en.lproj/GeneralPreferences.nib/designable.nib	Wed Jan 04 00:01:47 2012 -0500
@@ -1270,15 +1270,15 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">textColor: adium.preferenceController.Logging.Enable Logging</string>
+						<string key="label">textColor: chatHistoryDisplayActive</string>
 						<reference key="source" ref="202374623"/>
 						<reference key="destination" ref="836442907"/>
 						<object class="NSNibBindingConnector" key="connector">
 							<reference key="NSSource" ref="202374623"/>
 							<reference key="NSDestination" ref="836442907"/>
-							<string key="NSLabel">textColor: adium.preferenceController.Logging.Enable Logging</string>
+							<string key="NSLabel">textColor: chatHistoryDisplayActive</string>
 							<string key="NSBinding">textColor</string>
-							<string key="NSKeyPath">adium.preferenceController.Logging.Enable Logging</string>
+							<string key="NSKeyPath">chatHistoryDisplayActive</string>
 							<object class="NSDictionary" key="NSOptions">
 								<string key="NS.key.0">NSValueTransformerName</string>
 								<string key="NS.object.0">AIBoolToControlTextColorTransformer</string>
@@ -1286,7 +1286,7 @@
 							<int key="NSNibBindingConnectorVersion">2</int>
 						</object>
 					</object>
-					<int key="connectionID">407</int>
+					<int key="connectionID">410</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
@@ -2006,7 +2006,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">409</int>
+			<int key="maxID">410</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff -r 26a31e2dd111 -r 7dacc933b805 Resources/en.lproj/GeneralPreferences.nib/keyedobjects.nib
Binary file Resources/en.lproj/GeneralPreferences.nib/keyedobjects.nib has changed