Minor fixes.

1. Do not duplicate encryption key and channel key on configuration duplication. 2. Fixed proxy setting not saving properly. 3. Fixed setting to prefer IPv6 being bound incorrectly.
bakerma07 · Jul 4, 2012 · 8feaa40 · 8feaa40
1 parent d656bf3
commit 8feaa40
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 71 deletions.
diff --git a/Classes/Controllers/TXMenuController.m b/Classes/Controllers/TXMenuController.m
@@ -468,7 +468,7 @@ - (void)_onWantFindPanel:(id)sender
 		if ([newPhrase isNotEqualTo:self.currentSearchPhrase]) {
 			self.currentSearchPhrase = newPhrase;
 		}
-		
+
 		dispatch_async(dispatch_get_main_queue(), ^{
 			[[self currentWebView] searchFor:newPhrase direction:YES caseSensitive:NO wrap:YES];
 		});

diff --git a/Classes/Dialogs/TDCServerSheet.m b/Classes/Dialogs/TDCServerSheet.m
@@ -440,7 +440,10 @@ - (void)addChannel:(id)sender
 		IRCChannelConfig *c = [self.config.channels safeObjectAtIndex:sel];
 
 		conf = [c mutableCopy];
-		conf.name = NSStringEmptyPlaceholder;
+
+		conf.name			= NSStringEmptyPlaceholder;
+		conf.password		= NSStringEmptyPlaceholder;
+		conf.encryptionKey	= NSStringEmptyPlaceholder;
 	}
 
 	self.channelSheet = nil;

diff --git a/Classes/IRC/IRCClientConfig.m b/Classes/IRC/IRCClientConfig.m
@@ -166,18 +166,18 @@ - (id)initWithDictionary:(NSDictionary *)dic
 	if ((self = [self init])) {
 		dic = [TPCPreferencesMigrationAssistant convertIRCClientConfiguration:dic];
 
-		self.cuid = NSDictionaryIntegerKeyValueCompare(dic, @"connectionID", self.cuid);
-		self.guid = NSDictionaryObjectKeyValueCompare(dic, @"uniqueIdentifier", self.guid);
-		self.name = NSDictionaryObjectKeyValueCompare(dic, @"connectionName", self.name);
-		self.host = NSDictionaryObjectKeyValueCompare(dic, @"serverAddress", self.host);
-		self.port = NSDictionaryIntegerKeyValueCompare(dic, @"serverPort", self.port);
-		self.nick = NSDictionaryObjectKeyValueCompare(dic, @"identityNickname", self.nick);
-		self.username = NSDictionaryObjectKeyValueCompare(dic, @"identityUsername", self.username);
-		self.realName = NSDictionaryObjectKeyValueCompare(dic, @"identityRealname", self.realName);
+		self.cuid		= NSDictionaryIntegerKeyValueCompare(dic, @"connectionID", self.cuid);
+		self.guid		= NSDictionaryObjectKeyValueCompare(dic, @"uniqueIdentifier", self.guid);
+		self.name		= NSDictionaryObjectKeyValueCompare(dic, @"connectionName", self.name);
+		self.host		= NSDictionaryObjectKeyValueCompare(dic, @"serverAddress", self.host);
+		self.port		= NSDictionaryIntegerKeyValueCompare(dic, @"serverPort", self.port);
+		self.nick		= NSDictionaryObjectKeyValueCompare(dic, @"identityNickname", self.nick);
+		self.username	= NSDictionaryObjectKeyValueCompare(dic, @"identityUsername", self.username);
+		self.realName	= NSDictionaryObjectKeyValueCompare(dic, @"identityRealname", self.realName);
 
 		[self.altNicks addObjectsFromArray:[dic arrayForKey:@"identityAlternateNicknames"]];
 
-		self.proxyType       = (TXConnectionProxyType)[dic integerForKey:@"proxy"];
+		self.proxyType       = (TXConnectionProxyType)[dic integerForKey:@"proxyServerType"];
 		self.proxyPort       = NSDictionaryIntegerKeyValueCompare(dic, @"proxyServerPort", self.proxyPort);
 		self.proxyHost		 = NSDictionaryObjectKeyValueCompare(dic, @"proxyServerAddress", self.proxyHost);
 		self.proxyUser		 = NSDictionaryObjectKeyValueCompare(dic, @"proxyServerUsername", self.proxyUser);

diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -47,8 +47,8 @@
 	<key>TXBundleBuildCodeName</key>
 	<string>Turtle Soup</string>
 	<key>TXBundleBuildNumber</key>
-	<string>11755</string>
+	<string>11768</string>
 	<key>TXBundleBuildReference</key>
-	<string>2.1.1-225-gddec015-debug,llvm4.0</string>
+	<string>2.1.1-226-gd656bf3-debug,llvm4.0</string>
 </dict>
 </plist>
diff --git a/Resources/Localization/English.lproj/TDCAboutPanel.xib b/Resources/Localization/English.lproj/TDCAboutPanel.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">12A239</string>
+		<int key="IBDocument.SystemTarget">1080</int>
+		<string key="IBDocument.SystemVersion">12A256</string>
 		<string key="IBDocument.InterfaceBuilderVersion">2541</string>
-		<string key="IBDocument.AppKitVersion">1179.1</string>
-		<string key="IBDocument.HIToolboxVersion">620.00</string>
+		<string key="IBDocument.AppKitVersion">1185</string>
+		<string key="IBDocument.HIToolboxVersion">622.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			<string key="NS.object.0">2541</string>
@@ -42,14 +42,14 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{792, 644}, {201, 159}}</string>
+				<string key="NSWindowRect">{{792, 644}, {203, 159}}</string>
 				<int key="NSWTFlags">544736256</int>
 				<string key="NSWindowTitle"/>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
 				<nil key="NSUserInterfaceItemIdentifier"/>
 				<object class="NSView" key="NSWindowView" id="1006">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -70,6 +70,7 @@
 							</object>
 							<string key="NSFrame">{{72, 79}, {60, 60}}</string>
 							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="175084734"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="967338814">
@@ -92,6 +93,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{73, 42}, {58, 18}}</string>
 							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="65052053"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="378550857">
@@ -130,6 +132,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 20}, {167, 14}}</string>
 							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="839732920">
 								<int key="NSCellFlags">70254657</int>
@@ -147,7 +150,9 @@
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</object>
-					<string key="NSFrameSize">{201, 159}</string>
+					<string key="NSFrameSize">{203, 159}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="630693579"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
@@ -317,13 +322,21 @@
 			<nil key="sourceID"/>
 			<int key="maxID">23</int>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">TDCAboutPanel</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/TDCAboutPanel.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1060" key="NS.object.0"/>
-		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
 			<integer value="3000" key="NS.object.0"/>