adium 4434:79f3cbfc38eb: Refactor Jabber account preferences a bit.
commits at adium.im
commits at adium.im
Sat Dec 24 15:03:03 UTC 2011
details: http://hg.adium.im/adium/rev/79f3cbfc38eb
revision: 4434:79f3cbfc38eb
branch: XMPPClientCerts
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sat Dec 24 16:00:53 2011 +0100
Refactor Jabber account preferences a bit.
diffs (truncated from 4628 to 1000 lines):
diff -r 2a8b83313a50 -r 79f3cbfc38eb Plugins/Purple Service/ESPurpleJabberAccount.h
--- a/Plugins/Purple Service/ESPurpleJabberAccount.h Sun Nov 20 18:33:37 2011 +0100
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.h Sat Dec 24 16:00:53 2011 +0100
@@ -29,7 +29,6 @@
#define KEY_JABBER_SUBSCRIPTION_GROUP @"Jabber:Default Subscription Group"
#define KEY_JABBER_VERIFY_CERTS @"Jabber:Verify Certificates"
#define KEY_JABBER_FT_PROXIES @"Jabber:File Transfer Proxies"
-#define KEY_JABBER_AUTHENTICATION_METHOD @"Jabber:Authentication Method"
@class AMXMLConsoleController, AMPurpleJabberServiceDiscoveryBrowsing, AMPurpleJabberAdHocServer;
diff -r 2a8b83313a50 -r 79f3cbfc38eb Plugins/Purple Service/ESPurpleJabberAccountViewController.h
--- a/Plugins/Purple Service/ESPurpleJabberAccountViewController.h Sun Nov 20 18:33:37 2011 +0100
+++ b/Plugins/Purple Service/ESPurpleJabberAccountViewController.h Sat Dec 24 16:00:53 2011 +0100
@@ -23,6 +23,8 @@
IBOutlet NSTextField *textField_resource;
IBOutlet NSTextField *textField_priorityAvailable;
IBOutlet NSTextField *textField_priorityAway;
+ IBOutlet NSSlider *slider_priorityAvailable;
+ IBOutlet NSSlider *slider_priorityAway;
IBOutlet NSTextField *textField_ftProxies;
IBOutlet NSButton *checkBox_useTLS;
IBOutlet NSButton *checkBox_forceOldSSL;
@@ -32,8 +34,8 @@
IBOutlet NSPopUpButton *popup_subscriptionBehavior;
IBOutlet NSTextField *textField_subscriptionModeLabel;
IBOutlet NSComboBox *comboBox_subscriptionGroup;
- IBOutlet NSPopUpButton *popup_authenticationMethod;
IBOutlet NSPopUpButton *popup_clientSideCertificates;
+ IBOutlet NSTextField *label_checkMail;
IBOutlet NSButton *button_register;
@@ -44,6 +46,8 @@
IBOutlet NSTextView *textView_serverDescription;
IBOutlet NSButton *button_serverHomepage;
+ IBOutlet NSView *view_connectionOptions;
+
NSArray *servers;
}
@@ -55,6 +59,4 @@
- (IBAction)visitServerHomepage:(id)sender;
-- (IBAction)changeAuthenticationType:(id)sender;
-
@end
diff -r 2a8b83313a50 -r 79f3cbfc38eb Plugins/Purple Service/ESPurpleJabberAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleJabberAccountViewController.m Sun Nov 20 18:33:37 2011 +0100
+++ b/Plugins/Purple Service/ESPurpleJabberAccountViewController.m Sat Dec 24 16:00:53 2011 +0100
@@ -20,12 +20,12 @@
#import <Adium/AIService.h>
#import <Adium/AIContactList.h>
#import <SystemConfiguration/SystemConfiguration.h>
-#include <tgmath.h>
+#import <tgmath.h>
#import <Security/Security.h>
#import <unistd.h>
-#include <sys/param.h>
+#import <sys/param.h>
#define SERVERFEEDRSSURL @"http://xmpp.org/services/services-full.xml"
@@ -44,8 +44,68 @@
{
[super awakeFromNib];
- [checkBox_checkMail setEnabled:NO];
+ [checkBox_checkMail setHidden:TRUE];
+ [label_checkMail setHidden:TRUE];
+ char kcPath[MAXPATHLEN + 1];
+ UInt32 kcPathLen = MAXPATHLEN + 1;
+ SecKeychainRef kcRef = nil;
+ OSStatus err;
+ BOOL foundAny = FALSE;
+
+ err = SecKeychainCopyDefault(&kcRef);
+ if(err) {
+ AILogWithSignature(@"SecKeychainCopyDefault returned %d; aborting.", (int)err);
+ return;
+ }
+ err = SecKeychainGetPath(kcRef, &kcPathLen, kcPath);
+ if(err) {
+ AILogWithSignature(@"SecKeychainGetPath returned %d; aborting.", (int)err);
+ return;
+ }
+
+ CFRelease(kcRef);
+
+ err = SecKeychainOpen(kcPath, &kcRef);
+ if(err) {
+ AILogWithSignature(@"SecKeychainOpen returned %d.", (int)err);
+ AILogWithSignature(@"Cannot open keychain at %s. Aborting.", kcPath);
+ return;
+ }
+
+ SecIdentitySearchRef srchRef = nil;
+ err = SecIdentitySearchCreate(kcRef, CSSM_KEYUSE_SIGN, &srchRef);
+ if(err) {
+ AILogWithSignature(@"SecIdentitySearchCreate returned %d.", (int)err);
+ AILogWithSignature(@"Cannot find signing key in keychain at %s. Aborting.", kcPath);
+ return;
+ }
+
+ SecIdentityRef identity = nil;
+
+ while(1) {
+ err = SecIdentitySearchCopyNext(srchRef, &identity);
+
+ if(err) {
+ break;
+ }
+
+ if(CFGetTypeID(identity) != SecIdentityGetTypeID()) {
+ AILogWithSignature(@"SecIdentitySearchCopyNext CFTypeID failure!");
+ continue;
+ }
+
+ if (!foundAny) {
+ foundAny = TRUE;
+ [[popup_clientSideCertificates menu] addItem:[NSMenuItem separatorItem]];
+ }
+
+ SecCertificateRef client_cert = nil;
+ SecIdentityCopyCertificate(identity, &client_cert);
+
+ [popup_clientSideCertificates addItemWithTitle:[(NSString *)SecCertificateCopySubjectSummary(client_cert) autorelease]];
+ }
+
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(contactListChanged:)
name:Contact_ListChanged
@@ -57,10 +117,6 @@
{
[super configureForAccount:inAccount];
- [popup_authenticationMethod selectItemAtIndex:[[account preferenceForKey:KEY_JABBER_AUTHENTICATION_METHOD group:GROUP_ACCOUNT_STATUS] integerValue]];
-
- [self changeAuthenticationType:popup_authenticationMethod];
-
//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]];
@@ -85,9 +141,11 @@
//Priority
NSNumber *priority = [account preferenceForKey:KEY_JABBER_PRIORITY_AVAILABLE group:GROUP_ACCOUNT_STATUS];
- [textField_priorityAvailable setStringValue:(priority ? [priority stringValue] : @"")];
+ [textField_priorityAvailable setStringValue:(priority ? [priority stringValue] : @"0")];
+ [slider_priorityAvailable setIntegerValue:(priority ? [priority integerValue] : 0)];
priority = [account preferenceForKey:KEY_JABBER_PRIORITY_AWAY group:GROUP_ACCOUNT_STATUS];
- [textField_priorityAway setStringValue:(priority ? [priority stringValue] : @"")];
+ [textField_priorityAway setStringValue:(priority ? [priority stringValue] : @"0")];
+ [slider_priorityAway setIntegerValue:(priority ? [priority integerValue] : 0)];
//File transfer proxies
NSString *ftProxies = [account preferenceForKey:KEY_JABBER_FT_PROXIES group:GROUP_ACCOUNT_STATUS];
@@ -111,9 +169,6 @@
{
[super saveConfiguration];
- [account setPreference:[NSNumber numberWithInteger:[popup_authenticationMethod indexOfItem:[popup_authenticationMethod selectedItem]]]
- forKey:KEY_JABBER_AUTHENTICATION_METHOD group:GROUP_ACCOUNT_STATUS];
-
//Connection security
[account setPreference:[NSNumber numberWithBool:[checkBox_forceOldSSL state]]
forKey:KEY_JABBER_FORCE_OLD_SSL group:GROUP_ACCOUNT_STATUS];
@@ -141,10 +196,10 @@
forKey:KEY_JABBER_FT_PROXIES group:GROUP_ACCOUNT_STATUS];
//Priority
- [account setPreference:([textField_priorityAvailable integerValue] ? [NSNumber numberWithInteger:[textField_priorityAvailable integerValue]] : nil)
+ [account setPreference:([slider_priorityAvailable integerValue] ? [NSNumber numberWithInteger:[slider_priorityAvailable integerValue]] : nil)
forKey:KEY_JABBER_PRIORITY_AVAILABLE
group:GROUP_ACCOUNT_STATUS];
- [account setPreference:([textField_priorityAway integerValue] ? [NSNumber numberWithInteger:[textField_priorityAway integerValue]] : nil)
+ [account setPreference:([slider_priorityAway integerValue] ? [NSNumber numberWithInteger:[slider_priorityAway integerValue]] : nil)
forKey:KEY_JABBER_PRIORITY_AWAY
group:GROUP_ACCOUNT_STATUS];
@@ -156,72 +211,12 @@
forKey:KEY_JABBER_SUBSCRIPTION_GROUP group:GROUP_ACCOUNT_STATUS];
}
-- (IBAction)changeAuthenticationType:(id)sender {
- // if client-side is used, get all possible certificates, and hide the password field
-
- if ([popup_authenticationMethod selectedTag] == 1) {
- [[textField_password animator] setHidden:TRUE];
- [[popup_clientSideCertificates animator] setHidden:FALSE];
-
- [popup_clientSideCertificates removeAllItems];
-
- char kcPath[MAXPATHLEN + 1];
- UInt32 kcPathLen = MAXPATHLEN + 1;
- SecKeychainRef kcRef = nil;
- OSStatus err;
-
- err = SecKeychainCopyDefault(&kcRef);
- if(err) {
- AILogWithSignature(@"SecKeychainCopyDefault returned %d; aborting.", (int)err);
- return;
- }
- err = SecKeychainGetPath(kcRef, &kcPathLen, kcPath);
- if(err) {
- AILogWithSignature(@"SecKeychainGetPath returned %d; aborting.", (int)err);
- return;
- }
-
- CFRelease(kcRef);
-
- err = SecKeychainOpen(kcPath, &kcRef);
- if(err) {
- AILogWithSignature(@"SecKeychainOpen returned %d.", (int)err);
- AILogWithSignature(@"Cannot open keychain at %s. Aborting.", kcPath);
- return;
- }
-
- SecIdentitySearchRef srchRef = nil;
- err = SecIdentitySearchCreate(kcRef, CSSM_KEYUSE_SIGN, &srchRef);
- if(err) {
- AILogWithSignature(@"SecIdentitySearchCreate returned %d.", (int)err);
- AILogWithSignature(@"Cannot find signing key in keychain at %s. Aborting.", kcPath);
- return;
- }
-
- SecIdentityRef identity = nil;
-
- while(1) {
- err = SecIdentitySearchCopyNext(srchRef, &identity);
-
- if(err) {
- break;
- }
-
- if(CFGetTypeID(identity) != SecIdentityGetTypeID()) {
- AILogWithSignature(@"SecIdentitySearchCopyNext CFTypeID failure!");
- continue;
- }
-
- SecCertificateRef client_cert = nil;
- SecIdentityCopyCertificate(identity, &client_cert);
-
- [popup_clientSideCertificates addItemWithTitle:[(NSString *)SecCertificateCopySubjectSummary(client_cert) autorelease]];
- }
-
- } else {
- [[textField_password animator] setHidden:FALSE];
- [[popup_clientSideCertificates animator] setHidden:TRUE];
- }
+- (IBAction)changedPreference:(id)sender
+{
+ [super changedPreference:sender];
+
+ [textField_priorityAvailable setIntegerValue:[slider_priorityAvailable integerValue]];
+ [textField_priorityAway setIntegerValue:[slider_priorityAway integerValue]];
}
- (IBAction)subscriptionModeDidChange:(id)sender {
diff -r 2a8b83313a50 -r 79f3cbfc38eb Plugins/Purple Service/en.lproj/ESPurpleJabberAccountView.xib
--- a/Plugins/Purple Service/en.lproj/ESPurpleJabberAccountView.xib Sun Nov 20 18:33:37 2011 +0100
+++ b/Plugins/Purple Service/en.lproj/ESPurpleJabberAccountView.xib Sat Dec 24 16:00:53 2011 +0100
@@ -2,24 +2,26 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11B26</string>
- <string key="IBDocument.InterfaceBuilderVersion">1617</string>
- <string key="IBDocument.AppKitVersion">1138</string>
- <string key="IBDocument.HIToolboxVersion">566.00</string>
+ <string key="IBDocument.SystemVersion">11C74</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1938</string>
+ <string key="IBDocument.AppKitVersion">1138.23</string>
+ <string key="IBDocument.HIToolboxVersion">567.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1617</string>
+ <string key="NS.object.0">1938</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
- <string>NSScroller</string>
+ <string>NSMenuItem</string>
<string>NSMenu</string>
+ <string>NSSliderCell</string>
<string>NSButton</string>
<string>NSCustomObject</string>
+ <string>NSSlider</string>
<string>NSTableView</string>
<string>NSCustomView</string>
<string>NSComboBox</string>
+ <string>NSTextField</string>
<string>NSComboBoxCell</string>
- <string>NSTextField</string>
<string>NSNumberFormatter</string>
<string>NSWindowTemplate</string>
<string>NSTextFieldCell</string>
@@ -31,12 +33,15 @@
<string>NSProgressIndicator</string>
<string>NSTextView</string>
<string>NSPopUpButton</string>
- <string>NSMenuItem</string>
+ <string>NSScroller</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="520546697">
<object class="NSCustomObject" id="393462939">
<string key="NSClassName">ESPurpleJabberAccountViewController</string>
@@ -51,125 +56,22 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSPopUpButton" id="917195583">
+ <object class="NSTextField" id="125554776">
<reference key="NSNextResponder" ref="837853317"/>
- <int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{172, 58}, {197, 26}}</string>
+ <int key="NSvFlags">264</int>
+ <string key="NSFrame">{{102, 38}, {68, 17}}</string>
<reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="286029264"/>
- <bool key="NSViewIsLayerTreeHost">YES</bool>
- <int key="NSViewLayerContentsRedrawPolicy">2</int>
- <string key="NSReuseIdentifierKey">_NS:179</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="617114090">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">2048</int>
+ <object class="NSTextFieldCell" key="NSCell" id="628957241">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">71303168</int>
+ <string key="NSContents">Password:</string>
<object class="NSFont" key="NSSupport" id="745543233">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
- <string key="NSCellIdentifier">_NS:179</string>
- <reference key="NSControlView" ref="917195583"/>
- <int key="NSButtonFlags">109199615</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="251923499">
- <string key="NSTitle">OtherViews</string>
- <array class="NSMutableArray" key="NSMenuItems"/>
- <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>
- </object>
- <object class="NSPopUpButton" id="900883061">
- <reference key="NSNextResponder" ref="837853317"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{172, 86}, {197, 26}}</string>
- <reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="125554776"/>
- <string key="NSReuseIdentifierKey">_NS:179</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="686617043">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">2048</int>
- <reference key="NSSupport" ref="745543233"/>
- <string key="NSCellIdentifier">_NS:179</string>
- <reference key="NSControlView" ref="900883061"/>
- <int key="NSButtonFlags">109199615</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="39853116">
- <string key="NSTitle">OtherViews</string>
- <array class="NSMutableArray" key="NSMenuItems">
- <object class="NSMenuItem" id="823446143">
- <reference key="NSMenu" ref="39853116"/>
- <string key="NSTitle">Password</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <object class="NSCustomResource" key="NSOnImage" id="896922436">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="540522738">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="686617043"/>
- </object>
- <object class="NSMenuItem" id="277688469">
- <reference key="NSMenu" ref="39853116"/>
- <string key="NSTitle">Client-side Certificate</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="896922436"/>
- <reference key="NSMixedImage" ref="540522738"/>
- <string key="NSAction">_popUpItemAction:</string>
- <int key="NSTag">1</int>
- <reference key="NSTarget" ref="686617043"/>
- </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>
- </object>
- <object class="NSTextField" id="125554776">
- <reference key="NSNextResponder" ref="837853317"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{102, 64}, {68, 17}}</string>
- <reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="917195583"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="628957241">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Password:</string>
- <reference key="NSSupport" ref="745543233"/>
<reference key="NSControlView" ref="125554776"/>
<object class="NSColor" key="NSBackgroundColor" id="701108434">
<int key="NSColorSpace">6</int>
@@ -191,30 +93,11 @@
</object>
</object>
</object>
- <object class="NSTextField" id="779272059">
- <reference key="NSNextResponder" ref="837853317"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 90}, {153, 17}}</string>
- <reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="900883061"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="763478478">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Authentication Method:</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="779272059"/>
- <reference key="NSBackgroundColor" ref="701108434"/>
- <reference key="NSTextColor" ref="564835922"/>
- </object>
- </object>
<object class="NSTextField" id="385654329">
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{93, 118}, {77, 17}}</string>
+ <string key="NSFrame">{{93, 63}, {77, 17}}</string>
<reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="812273374"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1072137665">
@@ -230,10 +113,9 @@
<object class="NSTextField" id="812273374">
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{175, 116}, {191, 22}}</string>
+ <string key="NSFrame">{{175, 61}, {191, 22}}</string>
<reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="779272059"/>
+ <reference key="NSNextKeyView" ref="125554776"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="819061816">
<int key="NSCellFlags">-1804468671</int>
@@ -263,9 +145,8 @@
<object class="NSTextField" id="286029264">
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{175, 61}, {191, 22}}</string>
+ <string key="NSFrame">{{175, 33}, {191, 22}}</string>
<reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="850011028"/>
<bool key="NSViewIsLayerTreeHost">YES</bool>
<int key="NSViewLayerContentsRedrawPolicy">2</int>
@@ -284,9 +165,8 @@
<object class="NSButton" id="272517914">
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{150, 12}, {200, 32}}</string>
+ <string key="NSFrame">{{150, -3}, {200, 32}}</string>
<reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="712274320">
@@ -310,9 +190,8 @@
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">-2147482368</int>
<object class="NSPSMatrix" key="NSDrawMatrix"/>
- <string key="NSFrame">{{20, 21}, {16, 16}}</string>
+ <string key="NSFrame">{{20, 6}, {16, 16}}</string>
<reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="688169103"/>
<int key="NSpiFlags">28938</int>
<double key="NSMaxValue">100</double>
@@ -320,9 +199,8 @@
<object class="NSTextField" id="688169103">
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">-2147483392</int>
- <string key="NSFrame">{{41, 23}, {76, 14}}</string>
+ <string key="NSFrame">{{41, 8}, {76, 14}}</string>
<reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="272517914"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="924854234">
@@ -340,375 +218,22 @@
</object>
</object>
</array>
- <string key="NSFrameSize">{457, 155}</string>
+ <string key="NSFrameSize">{457, 100}</string>
<reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="385654329"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
- <object class="NSCustomView" id="881248978">
+ <object class="NSCustomView" id="809544060">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSButton" id="611926856">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 113}, {212, 18}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="1069823102"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="685121442">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Allow plaintext authentication</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="611926856"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="634818190">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSSwitch</string>
- </object>
- <object class="NSButtonImageSource" key="NSAlternateImage" id="10299655">
- <string key="NSImageName">NSSwitch</string>
- </object>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="1069823102">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 93}, {143, 18}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="755212957"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="866512058">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Force old-style SSL</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="1069823102"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="634818190"/>
- <reference key="NSAlternateImage" ref="10299655"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSButton" id="767871570">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{160, 160}, {211, 18}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="13153345"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="355466928">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Display new mail notifications</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="767871570"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="634818190"/>
- <reference key="NSAlternateImage" ref="10299655"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
- <object class="NSTextField" id="23953802">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 283}, {240, 22}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="1071692987"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="557983517">
- <int key="NSCellFlags">-1804468671</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>
- </object>
- <object class="NSTextField" id="795157005">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 285}, {140, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="23953802"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="1046731873">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">BOSH Server:</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="795157005"/>
- <reference key="NSBackgroundColor" ref="701108434"/>
- <reference key="NSTextColor" ref="564835922"/>
- </object>
- </object>
- <object class="NSTextField" id="993950755">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 311}, {240, 22}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="795157005"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="897297612">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">4195328</int>
- <string key="NSContents"/>
- <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>
- </object>
- <object class="NSTextField" id="416544706">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 313}, {140, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="993950755"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="675922156">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Connect Server:</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="416544706"/>
- <reference key="NSBackgroundColor" ref="701108434"/>
- <reference key="NSTextColor" ref="564835922"/>
- </object>
- </object>
- <object class="NSTextField" id="223022732">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 253}, {240, 22}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="164156726"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="483716033">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">4195328</int>
- <string key="NSContents"/>
- <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"/>
- </object>
- </object>
- <object class="NSTextField" id="1071692987">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 255}, {140, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="223022732"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="275398507">
- <int key="NSCellFlags">67239424</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>
- </object>
- <object class="NSTextField" id="979941359">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{329, 223}, {73, 22}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="909698960"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="474262400">
- <int key="NSCellFlags">-1804468671</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>
- </object>
- <object class="NSTextField" id="198507305">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{286, 225}, {38, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="979941359"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="937801845">
- <int key="NSCellFlags">67239424</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>
- </object>
- <object class="NSTextField" id="56382938">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{162, 223}, {119, 22}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="198507305"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="27008867">
- <int key="NSCellFlags">-1804468671</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>
- </object>
- <object class="NSTextField" id="164156726">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 225}, {140, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="56382938"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="820922822">
- <int key="NSCellFlags">67239424</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>
- </object>
- <object class="NSTextField" id="1036357624">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 161}, {140, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="767871570"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="260175574">
- <int key="NSCellFlags">67239424</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>
- </object>
- <object class="NSTextField" id="835653998">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{17, 114}, {140, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="611926856"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="230227050">
- <int key="NSCellFlags">67239424</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>
- </object>
- <object class="NSTextField" id="909698960">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{43, 192}, {114, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="348268130"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="1007024952">
- <int key="NSCellFlags">67239424</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>
- </object>
- <object class="NSTextField" id="348268130">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{162, 189}, {61, 23}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="463018609"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="1041524998">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="348268130"/>
- <bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="427835941"/>
- <reference key="NSTextColor" ref="185594471"/>
- </object>
- </object>
- <object class="NSTextField" id="463018609">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{233, 192}, {91, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="400793057"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="277652672">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Away Priority:</string>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="463018609"/>
- <reference key="NSBackgroundColor" ref="701108434"/>
- <reference key="NSTextColor" ref="564835922"/>
- </object>
- </object>
- <object class="NSTextField" id="400793057">
- <reference key="NSNextResponder" ref="881248978"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrame">{{329, 188}, {73, 24}}</string>
- <reference key="NSSuperview" ref="881248978"/>
- <reference key="NSNextKeyView" ref="1036357624"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="481365549">
- <int key="NSCellFlags">-1804468671</int>
- <int key="NSCellFlags2">272630784</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="745543233"/>
- <reference key="NSControlView" ref="400793057"/>
- <bool key="NSDrawsBackground">YES</bool>
- <reference key="NSBackgroundColor" ref="427835941"/>
- <reference key="NSTextColor" ref="185594471"/>
- </object>
- </object>
<object class="NSPopUpButton" id="86797681">
- <reference key="NSNextResponder" ref="881248978"/>
+ <reference key="NSNextResponder" ref="809544060"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{159, 23}, {198, 26}}</string>
- <reference key="NSSuperview" ref="881248978"/>
+ <string key="NSFrame">{{155, 42}, {307, 26}}</string>
+ <reference key="NSSuperview" ref="809544060"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="520236742"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="686819324">
@@ -732,8 +257,14 @@
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <reference key="NSOnImage" ref="896922436"/>
- <reference key="NSMixedImage" ref="540522738"/>
+ <object class="NSCustomResource" key="NSOnImage" id="756192971">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuCheckmark</string>
+ </object>
+ <object class="NSCustomResource" key="NSMixedImage" id="395718536">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSMenuMixedState</string>
+ </object>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="686819324"/>
</object>
@@ -750,8 +281,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="896922436"/>
- <reference key="NSMixedImage" ref="540522738"/>
+ <reference key="NSOnImage" ref="756192971"/>
+ <reference key="NSMixedImage" ref="395718536"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">1</int>
<reference key="NSTarget" ref="686819324"/>
@@ -762,8 +293,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="896922436"/>
- <reference key="NSMixedImage" ref="540522738"/>
+ <reference key="NSOnImage" ref="756192971"/>
+ <reference key="NSMixedImage" ref="395718536"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">2</int>
<reference key="NSTarget" ref="686819324"/>
@@ -774,14 +305,15 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="896922436"/>
- <reference key="NSMixedImage" ref="540522738"/>
+ <reference key="NSOnImage" ref="756192971"/>
+ <reference key="NSMixedImage" ref="395718536"/>
<string key="NSAction">_popUpItemAction:</string>
<int key="NSTag">3</int>
<reference key="NSTarget" ref="686819324"/>
</object>
</array>
</object>
+ <int key="NSSelectedIndex">-1</int>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
@@ -789,10 +321,11 @@
</object>
</object>
<object class="NSTextField" id="129057903">
- <reference key="NSNextResponder" ref="881248978"/>
+ <reference key="NSNextResponder" ref="809544060"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{1, 29}, {156, 17}}</string>
- <reference key="NSSuperview" ref="881248978"/>
+ <string key="NSFrame">{{-3, 48}, {156, 17}}</string>
+ <reference key="NSSuperview" ref="809544060"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="86797681"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="21353665">
@@ -806,10 +339,11 @@
</object>
</object>
<object class="NSTextField" id="520236742">
- <reference key="NSNextResponder" ref="881248978"/>
More information about the commits
mailing list