adium 5746:c9ea80f7c084: Merged adium-1.6 into default.

commits at adium.im commits at adium.im
Wed Oct 30 00:26:54 UTC 2013


details:	http://hg.adium.im/adium/rev/c9ea80f7c084
revision:	5746:c9ea80f7c084
branch:		(none)
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Wed Oct 30 01:24:33 2013 +0100

Merged adium-1.6 into default.

diffs (truncated from 4187 to 1000 lines):

diff -r 2b250abef816 -r c9ea80f7c084 Plugins/Purple Service/AIPurpleGTalkAccountViewController.m
--- a/Plugins/Purple Service/AIPurpleGTalkAccountViewController.m	Tue Oct 29 22:51:50 2013 +0100
+++ b/Plugins/Purple Service/AIPurpleGTalkAccountViewController.m	Wed Oct 30 01:24:33 2013 +0100
@@ -23,9 +23,6 @@
 {
 	[super awakeFromNib];
 	
-	//GTalk forces the use of TLS
-	[checkBox_requireTLS setEnabled:NO];
-	
 	[checkBox_checkMail setEnabled:YES];
 }
 
diff -r 2b250abef816 -r c9ea80f7c084 Plugins/Purple Service/ESPurpleJabberAccount.h
--- a/Plugins/Purple Service/ESPurpleJabberAccount.h	Tue Oct 29 22:51:50 2013 +0100
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.h	Wed Oct 30 01:24:33 2013 +0100
@@ -24,6 +24,7 @@
 #define KEY_JABBER_USE_TLS				@"Jabber:Use TLS"
 #define KEY_JABBER_FORCE_OLD_SSL		@"Jabber:Force Old SSL"
 #define KEY_JABBER_REQUIRE_TLS			@"Jabber:Require TLS"
+#define KEY_JABBER_TLS					@"Jabber:TLS"
 #define KEY_JABBER_ALLOW_PLAINTEXT		@"Jabber:Allow Plaintext Authentication"
 #define KEY_JABBER_SUBSCRIPTION_BEHAVIOR @"Jabber:Subscription Behavior"
 #define KEY_JABBER_REGISTER_ON_CONNECT @"Jabber:Register on Connect"
@@ -33,6 +34,12 @@
 
 #define PURPLE_SSL_CDSA_BUGGY_TLS_WORKAROUND "ssl_cdsa_buggy_tls_workaround"
 
+typedef enum : short {
+	AIJabberTLSAllowed = 1,
+	AIJabberTLSRequired,
+	AIJabberTLSForwardSecrecRequired
+} AIJabberTLSSetting;
+
 @class AIJabberConsoleController, AMPurpleJabberServiceDiscoveryBrowsing, AMPurpleJabberAdHocServer;
 
 @interface ESPurpleJabberAccount : CBPurpleAccount <AIAccount_Files> {
diff -r 2b250abef816 -r c9ea80f7c084 Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m	Tue Oct 29 22:51:50 2013 +0100
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m	Wed Oct 30 01:24:33 2013 +0100
@@ -135,7 +135,8 @@
 	[super configurePurpleAccount];
 	
 	NSString	*connectServer;
-	BOOL		forceOldSSL, allowPlaintext, requireTLS;
+	BOOL		forceOldSSL, allowPlaintext;
+	AIJabberTLSSetting   requireTLS;
 
 	purple_account_set_username(account, self.purpleAccountName);
 
@@ -158,24 +159,27 @@
 	if (ftProxies.length) {
 		purple_account_set_string(account, "ft_proxies", [ftProxies UTF8String]);
 	}
-
-	/* We have 2 checkboxes in Adium 1.4.1 which combine to provide a single setting within libpurple, for historical reasons.
-	 * A later update should have new strings to describe this with a single drop-down labeled "Connection Security"
-	 *
-	 * Libpurple defaults to require_tls; we default to opportunistic_tls. Should we require it? -evands
-	 */
+	
 	char *connectionSecurity;
 	forceOldSSL = [[self preferenceForKey:KEY_JABBER_FORCE_OLD_SSL group:GROUP_ACCOUNT_STATUS] boolValue];
-	requireTLS = [[self preferenceForKey:KEY_JABBER_REQUIRE_TLS group:GROUP_ACCOUNT_STATUS] boolValue];
+	
+	if (![self preferenceForKey:KEY_JABBER_TLS group:GROUP_ACCOUNT_STATUS]) {
+		[self setPreference:@(AIJabberTLSRequired)
+					 forKey:KEY_JABBER_TLS
+					  group:GROUP_ACCOUNT_STATUS];
+	}
+	
+	requireTLS = [[self preferenceForKey:KEY_JABBER_TLS group:GROUP_ACCOUNT_STATUS] shortValue];
 	
 	if (forceOldSSL)
 		connectionSecurity = "old_ssl";
-	else if (requireTLS)
+	else if (requireTLS == AIJabberTLSAllowed)
+		connectionSecurity = "opportunistic_tls";
+	else
 		connectionSecurity = "require_tls";
-	else 
-		connectionSecurity = "opportunistic_tls";
 
 	purple_account_set_string(account, "connection_security", connectionSecurity);
+	purple_account_set_bool(account, "require_forward_secrecy", requireTLS == AIJabberTLSForwardSecrecRequired);
 
 	//Allow plaintext authorization over an unencrypted connection? Purple will prompt if this is NO and is needed.
 	allowPlaintext = [[self preferenceForKey:KEY_JABBER_ALLOW_PLAINTEXT group:GROUP_ACCOUNT_STATUS] boolValue];
diff -r 2b250abef816 -r c9ea80f7c084 Plugins/Purple Service/ESPurpleJabberAccountViewController.h
--- a/Plugins/Purple Service/ESPurpleJabberAccountViewController.h	Tue Oct 29 22:51:50 2013 +0100
+++ b/Plugins/Purple Service/ESPurpleJabberAccountViewController.h	Wed Oct 30 01:24:33 2013 +0100
@@ -25,8 +25,7 @@
 	IBOutlet	NSTextField		*textField_priorityAway;
 	IBOutlet	NSTextField		*textField_ftProxies;
 	IBOutlet	NSButton		*checkBox_forceOldSSL;
-	IBOutlet	NSButton		*checkBox_requireTLS;
-	IBOutlet	NSButton		*checkBox_checkCertificates;
+	IBOutlet	NSPopUpButton	*popup_TLS;
 	IBOutlet	NSButton		*checkBox_allowPlaintext;
 	IBOutlet	NSPopUpButton	*popup_subscriptionBehavior;
 	IBOutlet	NSTextField		*textField_subscriptionModeLabel;
diff -r 2b250abef816 -r c9ea80f7c084 Plugins/Purple Service/ESPurpleJabberAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleJabberAccountViewController.m	Tue Oct 29 22:51:50 2013 +0100
+++ b/Plugins/Purple Service/ESPurpleJabberAccountViewController.m	Wed Oct 30 01:24:33 2013 +0100
@@ -52,8 +52,7 @@
 	
 	//Connection security
 	[checkBox_forceOldSSL setState:[[account preferenceForKey:KEY_JABBER_FORCE_OLD_SSL group:GROUP_ACCOUNT_STATUS] boolValue]];
-	[checkBox_requireTLS setState:[[account preferenceForKey:KEY_JABBER_REQUIRE_TLS group:GROUP_ACCOUNT_STATUS] boolValue]];
-	[checkBox_checkCertificates setState:[account preferenceForKey:KEY_JABBER_VERIFY_CERTS group:GROUP_ACCOUNT_STATUS]?[[account preferenceForKey:KEY_JABBER_VERIFY_CERTS group:GROUP_ACCOUNT_STATUS] boolValue]:YES];
+	[popup_TLS selectItemWithTag:[[account preferenceForKey:KEY_JABBER_TLS group:GROUP_ACCOUNT_STATUS] shortValue]];
 	[checkBox_allowPlaintext setState:[[account preferenceForKey:KEY_JABBER_ALLOW_PLAINTEXT group:GROUP_ACCOUNT_STATUS] boolValue]];
 	
 	//Resource
@@ -106,10 +105,8 @@
 	//Connection security
 	[account setPreference:@([checkBox_forceOldSSL state])
 					forKey:KEY_JABBER_FORCE_OLD_SSL group:GROUP_ACCOUNT_STATUS];
-	[account setPreference:@([checkBox_requireTLS state])
-					forKey:KEY_JABBER_REQUIRE_TLS group:GROUP_ACCOUNT_STATUS];
-	[account setPreference:@([checkBox_checkCertificates state])
-					forKey:KEY_JABBER_VERIFY_CERTS group:GROUP_ACCOUNT_STATUS];
+	[account setPreference:@([popup_TLS selectedTag])
+					forKey:KEY_JABBER_TLS group:GROUP_ACCOUNT_STATUS];
 	[account setPreference:@([checkBox_allowPlaintext state])
 					forKey:KEY_JABBER_ALLOW_PLAINTEXT group:GROUP_ACCOUNT_STATUS];
 	
diff -r 2b250abef816 -r c9ea80f7c084 Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib
--- a/Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib	Tue Oct 29 22:51:50 2013 +0100
+++ b/Plugins/Purple Service/Resources/en.lproj/ESPurpleJabberAccountView.xib	Wed Oct 30 01:24:33 2013 +0100
@@ -2,15 +2,16 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">12D78</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.37</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<string key="IBDocument.SystemVersion">13A603</string>
+		<string key="IBDocument.InterfaceBuilderVersion">4514</string>
+		<string key="IBDocument.AppKitVersion">1265</string>
+		<string key="IBDocument.HIToolboxVersion">695.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">4514</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSBox</string>
 			<string>NSButton</string>
 			<string>NSButtonCell</string>
 			<string>NSComboBox</string>
@@ -65,7 +66,7 @@
 							<int key="NSCellFlags2">134217728</int>
 							<string key="NSContents">Find public server</string>
 							<object class="NSFont" key="NSSupport" id="745543233">
-								<string key="NSName">LucidaGrande</string>
+								<string key="NSName">.LucidaGrandeUI</string>
 								<double key="NSSize">13</double>
 								<int key="NSfFlags">1044</int>
 							</object>
@@ -114,6 +115,7 @@
 							</object>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 					</object>
 					<object class="NSTextField" id="385654329">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -133,6 +135,7 @@
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 					</object>
 					<object class="NSTextField" id="812273374">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -167,6 +170,7 @@
 							</object>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 					</object>
 					<object class="NSTextField" id="286029264">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -187,6 +191,7 @@
 							<reference key="NSTextColor" ref="185594471"/>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 					</object>
 					<object class="NSButton" id="272517914">
 						<reference key="NSNextResponder" ref="837853317"/>
@@ -232,19 +237,98 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="NSButton" id="611926856">
+					<object class="NSPopUpButton" id="956622459">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{162, -3}, {212, 26}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSPopUpButtonCell" key="NSCell" id="359011291">
+							<int key="NSCellFlags">-2076180416</int>
+							<int key="NSCellFlags2">2048</int>
+							<reference key="NSSupport" ref="745543233"/>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="956622459"/>
+							<int key="NSButtonFlags">109199360</int>
+							<int key="NSButtonFlags2">129</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+							<nil key="NSMenuItem"/>
+							<bool key="NSMenuItemRespectAlignment">YES</bool>
+							<object class="NSMenu" key="NSMenu" id="954515229">
+								<string key="NSTitle">OtherViews</string>
+								<array class="NSMutableArray" key="NSMenuItems">
+									<object class="NSMenuItem" id="265494125">
+										<reference key="NSMenu" ref="954515229"/>
+										<string key="NSTitle">Allow TLS</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSKeyEquivModMask">1048576</int>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<object class="NSCustomResource" key="NSOnImage" id="660623678">
+											<string key="NSClassName">NSImage</string>
+											<string key="NSResourceName">NSMenuCheckmark</string>
+										</object>
+										<object class="NSCustomResource" key="NSMixedImage" id="782541357">
+											<string key="NSClassName">NSImage</string>
+											<string key="NSResourceName">NSMenuMixedState</string>
+										</object>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">1</int>
+										<reference key="NSTarget" ref="359011291"/>
+									</object>
+									<object class="NSMenuItem" id="374491598">
+										<reference key="NSMenu" ref="954515229"/>
+										<string key="NSTitle">Require TLS</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<int key="NSState">1</int>
+										<reference key="NSOnImage" ref="660623678"/>
+										<reference key="NSMixedImage" ref="782541357"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">2</int>
+										<reference key="NSTarget" ref="359011291"/>
+									</object>
+									<object class="NSMenuItem" id="488784527">
+										<reference key="NSMenu" ref="954515229"/>
+										<string key="NSTitle">Require forward-secret TLS</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSKeyEquivModMask">1048576</int>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="660623678"/>
+										<reference key="NSMixedImage" ref="782541357"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<int key="NSTag">3</int>
+										<reference key="NSTarget" ref="359011291"/>
+									</object>
+								</array>
+								<reference key="NSMenuFont" ref="745543233"/>
+							</object>
+							<int key="NSSelectedIndex">-1</int>
+							<int key="NSPreferredEdge">1</int>
+							<bool key="NSUsesItemFromMenu">YES</bool>
+							<bool key="NSAltersState">YES</bool>
+							<int key="NSArrowPosition">2</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSButton" id="725948785">
 						<reference key="NSNextResponder" ref="881248978"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{160, 97}, {212, 18}}</string>
+						<string key="NSFrame">{{162, 47}, {212, 18}}</string>
 						<reference key="NSSuperview" ref="881248978"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="742514882"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="685121442">
+						<object class="NSButtonCell" key="NSCell" id="164546887">
 							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Allow plaintext authentication</string>
 							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="611926856"/>
+							<reference key="NSControlView" ref="725948785"/>
 							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<reference key="NSNormalImage" ref="948923301"/>
@@ -256,19 +340,20 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSButton" id="1069823102">
+					<object class="NSButton" id="742514882">
 						<reference key="NSNextResponder" ref="881248978"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{160, 77}, {143, 18}}</string>
+						<string key="NSFrame">{{162, 27}, {143, 18}}</string>
 						<reference key="NSSuperview" ref="881248978"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="918033324"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="866512058">
+						<object class="NSButtonCell" key="NSCell" id="764948145">
 							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Force old-style SSL</string>
 							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="1069823102"/>
+							<reference key="NSControlView" ref="742514882"/>
 							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<reference key="NSNormalImage" ref="948923301"/>
@@ -280,19 +365,372 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSButton" id="767871570">
+					<object class="NSTextField" id="918033324">
 						<reference key="NSNextResponder" ref="881248978"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{160, 144}, {211, 18}}</string>
+						<string key="NSFrame">{{18, 3}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="881248978"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="956622459"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSButtonCell" key="NSCell" id="355466928">
+						<object class="NSTextFieldCell" key="NSCell" id="806452371">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">TLS:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="918033324"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="211167815">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{18, 48}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="725948785"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="261546205">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Security:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="211167815"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="572921050">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{351, 135}, {73, 22}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="649887053"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="872634500">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="572921050"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<reference key="NSTextColor" ref="185594471"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="1023724760">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{308, 137}, {38, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="572921050"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="471761275">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Port:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="1023724760"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="642560139">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{18, 73}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="49044206"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="257496833">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">File Transfer Proxies:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="642560139"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="49044206">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{164, 71}, {260, 22}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="211167815"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="911619315">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="49044206"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<reference key="NSTextColor" ref="185594471"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSBox" id="47056901">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">12</int>
+						<string key="NSFrame">{{0, 163}, {424, 5}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="61460712"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<string key="NSOffsets">{0, 0}</string>
+						<object class="NSTextFieldCell" key="NSTitleCell">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">0</int>
+							<string key="NSContents">Box</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<object class="NSColor" key="NSTextColor">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+							</object>
+						</object>
+						<int key="NSBorderType">3</int>
+						<int key="NSBoxType">2</int>
+						<int key="NSTitlePosition">0</int>
+						<bool key="NSTransparent">NO</bool>
+					</object>
+					<object class="NSTextField" id="680345042">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{164, 103}, {260, 22}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="642560139"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="442585826">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="680345042"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<reference key="NSTextColor" ref="185594471"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="649887053">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{18, 105}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="680345042"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="175750350">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">BOSH Server:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="649887053"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="1022128655">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{164, 135}, {138, 22}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1023724760"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="961114762">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="1022128655"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<reference key="NSTextColor" ref="185594471"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="61460712">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{18, 137}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1022128655"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="210505303">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Connect Server:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="61460712"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="56907235">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">256</int>
+						<string key="NSFrame">{{44, 207}, {114, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1025417693"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="935046239">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Available Priority:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="56907235"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="1025417693">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">256</int>
+						<string key="NSFrame">{{164, 205}, {61, 23}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="988486290"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="96794039">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="1025417693"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<reference key="NSTextColor" ref="185594471"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="988486290">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">256</int>
+						<string key="NSFrame">{{67, 178}, {91, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="659816906"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="964020209">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Away Priority:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="988486290"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="659816906">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">256</int>
+						<string key="NSFrame">{{164, 176}, {61, 24}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="47056901"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="983780420">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="659816906"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<reference key="NSTextColor" ref="185594471"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="749209834">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{163, 234}, {187, 22}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="56907235"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="305261583">
+							<int key="NSCellFlags">-1804599231</int>
+							<int key="NSCellFlags2">4195328</int>
+							<string key="NSContents"/>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="749209834"/>
+							<bool key="NSDrawsBackground">YES</bool>
+							<reference key="NSBackgroundColor" ref="427835941"/>
+							<reference key="NSTextColor" ref="185594471"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSTextField" id="865276279">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{18, 236}, {140, 17}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="749209834"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSTextFieldCell" key="NSCell" id="214811375">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">71303168</int>
+							<string key="NSContents">Resource:</string>
+							<reference key="NSSupport" ref="745543233"/>
+							<reference key="NSControlView" ref="865276279"/>
+							<reference key="NSBackgroundColor" ref="701108434"/>
+							<reference key="NSTextColor" ref="564835922"/>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+					</object>
+					<object class="NSButton" id="367220447">
+						<reference key="NSNextResponder" ref="881248978"/>
+						<int key="NSvFlags">264</int>
+						<string key="NSFrame">{{162, 286}, {211, 18}}</string>
+						<reference key="NSSuperview" ref="881248978"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1025009642"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="351684075">
 							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">0</int>
 							<string key="NSContents">Display new mail notifications</string>
 							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="767871570"/>
+							<reference key="NSControlView" ref="367220447"/>
 							<int key="NSButtonFlags">1211912448</int>
 							<int key="NSButtonFlags2">2</int>
 							<reference key="NSNormalImage" ref="948923301"/>
@@ -304,313 +742,96 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="23953802">
+					<object class="NSTextField" id="814826275">
 						<reference key="NSNextResponder" ref="881248978"/>
 						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{162, 267}, {240, 22}}</string>
+						<string key="NSFrame">{{18, 287}, {140, 17}}</string>
 						<reference key="NSSuperview" ref="881248978"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="367220447"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="557983517">
-							<int key="NSCellFlags">-1804599231</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="23953802"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="427835941"/>
-							<reference key="NSTextColor" ref="185594471"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="795157005">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{17, 269}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1046731873">
+						<object class="NSTextFieldCell" key="NSCell" id="199476239">
 							<int key="NSCellFlags">67108864</int>
 							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">BOSH Server:</string>
+							<string key="NSContents">Mail:</string>
 							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="795157005"/>
+							<reference key="NSControlView" ref="814826275"/>
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 					</object>
-					<object class="NSTextField" id="993950755">
+					<object class="NSTextField" id="1025009642">
 						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{162, 295}, {240, 22}}</string>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{84, 264}, {74, 17}}</string>
 						<reference key="NSSuperview" ref="881248978"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="349202887"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="897297612">
-							<int key="NSCellFlags">-1804599231</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
+						<object class="NSTextFieldCell" key="NSCell" id="706054918">
+							<int key="NSCellFlags">68157504</int>
+							<int key="NSCellFlags2">272630784</int>
+							<string key="NSContents">Emoticons:</string>
 							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="993950755"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="427835941"/>
-							<reference key="NSTextColor" ref="185594471"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="416544706">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{17, 297}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="675922156">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Connect Server:</string>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="416544706"/>
+							<reference key="NSControlView" ref="1025009642"/>
 							<reference key="NSBackgroundColor" ref="701108434"/>
 							<reference key="NSTextColor" ref="564835922"/>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
 					</object>
-					<object class="NSTextField" id="223022732">
+					<object class="NSButton" id="349202887">
 						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{162, 237}, {240, 22}}</string>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{162, 263}, {188, 18}}</string>
 						<reference key="NSSuperview" ref="881248978"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="865276279"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="483716033">
-							<int key="NSCellFlags">-1804599231</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
+						<object class="NSButtonCell" key="NSCell" id="782865761">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">0</int>
+							<string key="NSContents">Display custom emoticons</string>
 							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="223022732"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="427835941"/>
-							<reference key="NSTextColor" ref="185594471"/>
+							<reference key="NSControlView" ref="349202887"/>
+							<int key="NSButtonFlags">1211912448</int>
+							<int key="NSButtonFlags2">2</int>
+							<reference key="NSNormalImage" ref="948923301"/>
+							<reference key="NSAlternateImage" ref="10299655"/>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">200</int>
+							<int key="NSPeriodicInterval">25</int>
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
-					<object class="NSTextField" id="1071692987">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{17, 239}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
+				</array>
+				<string key="NSFrameSize">{424, 304}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="814826275"/>
+				<string key="NSClassName">NSView</string>
+				<string key="NSExtension">NSResponder</string>
+			</object>
+			<object class="NSCustomView" id="809544060">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">256</int>
+				<array class="NSMutableArray" key="NSSubviews">
+					<object class="NSPopUpButton" id="232081523">
+						<reference key="NSNextResponder" ref="809544060"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{170, 32}, {198, 26}}</string>
+						<reference key="NSSuperview" ref="809544060"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="337874858"/>
 						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="275398507">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">File Transfer Proxies:</string>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="1071692987"/>
-							<reference key="NSBackgroundColor" ref="701108434"/>
-							<reference key="NSTextColor" ref="564835922"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="979941359">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{329, 207}, {73, 22}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="474262400">
-							<int key="NSCellFlags">-1804599231</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="979941359"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="427835941"/>
-							<reference key="NSTextColor" ref="185594471"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="198507305">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{286, 209}, {38, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="937801845">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Port:</string>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="198507305"/>
-							<reference key="NSBackgroundColor" ref="701108434"/>
-							<reference key="NSTextColor" ref="564835922"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="56382938">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{162, 207}, {119, 22}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="27008867">
-							<int key="NSCellFlags">-1804599231</int>
-							<int key="NSCellFlags2">4195328</int>
-							<string key="NSContents"/>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="56382938"/>
-							<bool key="NSDrawsBackground">YES</bool>
-							<reference key="NSBackgroundColor" ref="427835941"/>
-							<reference key="NSTextColor" ref="185594471"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="164156726">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{17, 209}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="820922822">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Resource:</string>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="164156726"/>
-							<reference key="NSBackgroundColor" ref="701108434"/>
-							<reference key="NSTextColor" ref="564835922"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="1036357624">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{17, 145}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="260175574">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Mail:</string>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="1036357624"/>
-							<reference key="NSBackgroundColor" ref="701108434"/>
-							<reference key="NSTextColor" ref="564835922"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="835653998">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">264</int>
-						<string key="NSFrame">{{17, 98}, {140, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="230227050">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Security:</string>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="835653998"/>
-							<reference key="NSBackgroundColor" ref="701108434"/>
-							<reference key="NSTextColor" ref="564835922"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="909698960">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{43, 176}, {114, 17}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>
-						<object class="NSTextFieldCell" key="NSCell" id="1007024952">
-							<int key="NSCellFlags">67108864</int>
-							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Available Priority:</string>
-							<reference key="NSSupport" ref="745543233"/>
-							<reference key="NSControlView" ref="909698960"/>
-							<reference key="NSBackgroundColor" ref="701108434"/>
-							<reference key="NSTextColor" ref="564835922"/>
-						</object>
-						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-					</object>
-					<object class="NSTextField" id="348268130">
-						<reference key="NSNextResponder" ref="881248978"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{162, 173}, {61, 23}}</string>
-						<reference key="NSSuperview" ref="881248978"/>
-						<reference key="NSWindow"/>
-						<bool key="NSEnabled">YES</bool>




More information about the commits mailing list