adium 4845:b7b9e309b4b1: Fix a couple issues from 9ab79a3458be: ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b7b9e309b4b1
revision:	4845:b7b9e309b4b1
branch:		(none)
author:		Frank Dowsett <wixardy at adium.im>
date:		Sat Jun 02 20:49:21 2012 -0400

Fix a couple issues from 9ab79a3458be: no default height, in prefs the "x" in "1000px" got cut off.

diffs (59 lines):

diff -r 9ab79a3458be -r b7b9e309b4b1 Resources/AppearanceDefaults.plist
--- a/Resources/AppearanceDefaults.plist	Sat Jun 02 17:52:00 2012 -0400
+++ b/Resources/AppearanceDefaults.plist	Sat Jun 02 20:49:21 2012 -0400
@@ -20,6 +20,8 @@
 	<string>iBubble Status</string>
 	<key>Vertical Autosizing</key>
 	<false/>
+	<key>Vertical Height</key>
+	<integer>200</integer>
 	<key>Window Opacity</key>
 	<real>1</real>
 	<key>Window Style</key>
diff -r 9ab79a3458be -r b7b9e309b4b1 Resources/Preferences-ContactList.xib
--- a/Resources/Preferences-ContactList.xib	Sat Jun 02 17:52:00 2012 -0400
+++ b/Resources/Preferences-ContactList.xib	Sat Jun 02 20:49:21 2012 -0400
@@ -638,7 +638,7 @@
 					<object class="NSTextField" id="232051777">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">258</int>
-						<string key="NSFrame">{{339, 124}, {39, 17}}</string>
+						<string key="NSFrame">{{339, 124}, {50, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSNextKeyView" ref="988932396"/>
 						<bool key="NSEnabled">YES</bool>
@@ -700,7 +700,7 @@
 					<object class="NSTextField" id="1010168786">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">258</int>
-						<string key="NSFrame">{{339, 151}, {39, 17}}</string>
+						<string key="NSFrame">{{339, 151}, {50, 17}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSNextKeyView" ref="789742726"/>
 						<bool key="NSEnabled">YES</bool>
@@ -1736,7 +1736,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1070" key="NS.object.0"/>
+			<real value="1060" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
diff -r 9ab79a3458be -r b7b9e309b4b1 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m	Sat Jun 02 17:52:00 2012 -0400
+++ b/Source/AIListWindowController.m	Sat Jun 02 20:49:21 2012 -0400
@@ -433,8 +433,11 @@
 			 contactListDesiredSizeChanged is called.
 			 */
 			if (!(autoResizeVertically || autoResizeHorizontally)) {
-				thisMinimumSize.width = forcedWindowWidth;
-				[[self window] setFrame:NSMakeRect(currentFrame.origin.x,currentFrame.origin.y,forcedWindowWidth,currentFrame.size.height) 
+				if (forcedWindowWidth != -1)
+					thisMinimumSize.width = forcedWindowWidth;
+				if (forcedWindowHeight != -1)
+					thisMinimumSize.height = forcedWindowHeight;
+				[[self window] setFrame:NSMakeRect(currentFrame.origin.x,currentFrame.origin.y,forcedWindowWidth,currentFrame.size.height)
 								display:YES
 								animate:NO];
 			}