adium 3869:e9f94c290817: Change ICQ and AIM encryption settings ...
commits at adium.im
commits at adium.im
Sun Apr 17 10:51:50 UTC 2011
details: http://hg.adium.im/adium/rev/e9f94c290817
revision: 3869:e9f94c290817
branch: (none)
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Sun Apr 17 12:51:21 2011 +0200
Change ICQ and AIM encryption settings to no/opportunistic/required encryption.
For ICQ, all accounts will be changed to opportunistic (as the SSL settings were wiped by 1.4.1).
For AIM, when SSL was on, encryption is now required. When SSL was off, encryption is now opportunistic.
Additionally, turn on clientLogin for AIM.
Fixes #15000
diffs (truncated from 4627 to 1000 lines):
diff -r 1f94c71dda38 -r e9f94c290817 Plugins/Purple Service/AIPurpleOscarAccountViewController.h
--- a/Plugins/Purple Service/AIPurpleOscarAccountViewController.h Fri Apr 15 09:34:42 2011 -0500
+++ b/Plugins/Purple Service/AIPurpleOscarAccountViewController.h Sun Apr 17 12:51:21 2011 +0200
@@ -18,7 +18,7 @@
@interface AIPurpleOscarAccountViewController : PurpleAccountViewController {
IBOutlet NSButton *checkBox_proxyServer;
- IBOutlet NSButton *checkBox_SSL;
+ IBOutlet NSMatrix *radio_Encryption;
IBOutlet NSButton *checkbox_multipleLogins;
}
diff -r 1f94c71dda38 -r e9f94c290817 Plugins/Purple Service/AIPurpleOscarAccountViewController.m
--- a/Plugins/Purple Service/AIPurpleOscarAccountViewController.m Fri Apr 15 09:34:42 2011 -0500
+++ b/Plugins/Purple Service/AIPurpleOscarAccountViewController.m Sun Apr 17 12:51:21 2011 +0200
@@ -19,8 +19,24 @@
#import "CBPurpleOscarAccount.h"
#import <Adium/AIAccount.h>
+ at interface AIPurpleOscarAccountViewController (PRIVATE)
++ (NSArray *)encryptionTypes;
+ at end
+
@implementation AIPurpleOscarAccountViewController
++ (NSArray *)encryptionTypes
+{
+ static NSArray *encryptionTypes;
+
+ if (!encryptionTypes) {
+ encryptionTypes = [[NSArray alloc] initWithObjects:PREFERENCE_ENCRYPTION_TYPE_NO,
+ PREFERENCE_ENCRYPTION_TYPE_OPPORTUNISTIC, PREFERENCE_ENCRYPTION_TYPE_REQUIRED, nil];
+ }
+
+ return encryptionTypes;
+}
+
/*!
* @brief Configure controls
*/
@@ -29,8 +45,17 @@
[super configureForAccount:inAccount];
[checkBox_proxyServer setState:[[account preferenceForKey:PREFERENCE_FT_PROXY_SERVER group:GROUP_ACCOUNT_STATUS] boolValue]];
- [checkBox_SSL setState:[[account preferenceForKey:PREFERENCE_SSL_CONNECTION group:GROUP_ACCOUNT_STATUS] boolValue]];
[checkbox_multipleLogins setState:[[account preferenceForKey:PREFERENCE_ALLOW_MULTIPLE_LOGINS group:GROUP_ACCOUNT_STATUS] boolValue]];
+
+ for (NSButtonCell* cell in [radio_Encryption cells]) {
+ if ([[[AIPurpleOscarAccountViewController encryptionTypes] objectAtIndex:[cell tag]]
+ isEqualToString:[account preferenceForKey:PREFERENCE_ENCRYPTION_TYPE
+ group:GROUP_ACCOUNT_STATUS]]) {
+ [cell setState:NSOnState];
+ } else {
+ [cell setState:NSOffState];
+ }
+ }
}
/*!
@@ -44,8 +69,8 @@
forKey:PREFERENCE_FT_PROXY_SERVER
group:GROUP_ACCOUNT_STATUS];
- [account setPreference:[NSNumber numberWithBool:[checkBox_SSL state]]
- forKey:PREFERENCE_SSL_CONNECTION
+ [account setPreference:[[AIPurpleOscarAccountViewController encryptionTypes] objectAtIndex:[radio_Encryption selectedTag]]
+ forKey:PREFERENCE_ENCRYPTION_TYPE
group:GROUP_ACCOUNT_STATUS];
[account setPreference:[NSNumber numberWithBool:[checkbox_multipleLogins state]]
diff -r 1f94c71dda38 -r e9f94c290817 Plugins/Purple Service/CBPurpleOscarAccount.h
--- a/Plugins/Purple Service/CBPurpleOscarAccount.h Fri Apr 15 09:34:42 2011 -0500
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.h Sun Apr 17 12:51:21 2011 +0200
@@ -30,8 +30,16 @@
#define PREFERENCE_ALLOW_MULTIPLE_LOGINS @"Allow Multiple Logins"
#define PREFERENCE_FT_PROXY_SERVER @"Always Use FT Proxy"
+
+// obsolete, migrate to PREFERENCE_ENCRYPTION_TYPE
#define PREFERENCE_SSL_CONNECTION @"Connect Using SSL"
+#define PREFERENCE_ENCRYPTION_TYPE @"Encryption Type"
+
+#define PREFERENCE_ENCRYPTION_TYPE_OPPORTUNISTIC @"Opportunistic Encryption"
+#define PREFERENCE_ENCRYPTION_TYPE_REQUIRED @"Require Encryption"
+#define PREFERENCE_ENCRYPTION_TYPE_NO @"No Encryption"
+
@interface CBPurpleOscarAccount : CBPurpleAccount <AIAccount_Files> {
NSTimer *delayedSignonUpdateTimer;
NSMutableArray *arrayOfContactsForDelayedUpdates;
diff -r 1f94c71dda38 -r e9f94c290817 Plugins/Purple Service/CBPurpleOscarAccount.m
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m Fri Apr 15 09:34:42 2011 -0500
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.m Sun Apr 17 12:51:21 2011 +0200
@@ -41,6 +41,9 @@
@interface CBPurpleOscarAccount ()
- (NSString *)stringByProcessingImgTagsForDirectIM:(NSString *)inString forContactWithUID:(const char *)who;
+
+// migration from 1.4.1 to 1.4.2
+- (void)migrateSSL;
@end
@implementation CBPurpleOscarAccount
@@ -79,12 +82,31 @@
purple_account_set_bool(account, "always_use_rv_proxy", [[self preferenceForKey:PREFERENCE_FT_PROXY_SERVER
group:GROUP_ACCOUNT_STATUS] boolValue]);
-
- purple_account_set_bool(account, "use_ssl", [[self preferenceForKey:PREFERENCE_SSL_CONNECTION
- group:GROUP_ACCOUNT_STATUS] boolValue]);
purple_account_set_bool(account, "allow_multiple_logins", [[self preferenceForKey:PREFERENCE_ALLOW_MULTIPLE_LOGINS
group:GROUP_ACCOUNT_STATUS] boolValue]);
+
+ // Always yes, so SSL on ICQ works again.
+ purple_account_set_bool(account, "use_clientlogin", TRUE);
+
+ // Migrate from SSL/no SSL to the tri-state popup button
+ if (![self preferenceForKey:PREFERENCE_ENCRYPTION_TYPE group:GROUP_ACCOUNT_STATUS]) {
+ [self migrateSSL];
+ [self setPreference:nil forKey:PREFERENCE_SSL_CONNECTION group:GROUP_ACCOUNT_STATUS];
+ }
+
+ if ([[self preferenceForKey:PREFERENCE_ENCRYPTION_TYPE group:GROUP_ACCOUNT_STATUS] isEqualToString:PREFERENCE_ENCRYPTION_TYPE_OPPORTUNISTIC]) {
+ purple_account_set_string(account, "encryption", "opportunistic_encryption");
+ } else if ([[self preferenceForKey:PREFERENCE_ENCRYPTION_TYPE group:GROUP_ACCOUNT_STATUS] isEqualToString:PREFERENCE_ENCRYPTION_TYPE_REQUIRED]) {
+ purple_account_set_string(account, "encryption", "require_encryption");
+ } else {
+ purple_account_set_string(account, "encryption", "no_encryption");
+ }
+}
+
+- (void)migrateSSL
+{
+ // ICQ and AIM should override this
}
- (BOOL)encrypted
diff -r 1f94c71dda38 -r e9f94c290817 Plugins/Purple Service/ESPurpleAIMAccount.m
--- a/Plugins/Purple Service/ESPurpleAIMAccount.m Fri Apr 15 09:34:42 2011 -0500
+++ b/Plugins/Purple Service/ESPurpleAIMAccount.m Sun Apr 17 12:51:21 2011 +0200
@@ -51,6 +51,19 @@
[adium.preferenceController registerPreferenceObserver:self forGroup:PREF_GROUP_NOTES];
}
+- (void)migrateSSL
+{
+ if ([self preferenceForKey:PREFERENCE_SSL_CONNECTION group:GROUP_ACCOUNT_STATUS]) {
+ [self setPreference:PREFERENCE_ENCRYPTION_TYPE_REQUIRED
+ forKey:PREFERENCE_ENCRYPTION_TYPE
+ group:GROUP_ACCOUNT_STATUS];
+ } else {
+ [self setPreference:PREFERENCE_ENCRYPTION_TYPE_OPPORTUNISTIC
+ forKey:PREFERENCE_ENCRYPTION_TYPE
+ group:GROUP_ACCOUNT_STATUS];
+ }
+}
+
- (void)dealloc
{
[adium.preferenceController unregisterPreferenceObserver:self];
diff -r 1f94c71dda38 -r e9f94c290817 Plugins/Purple Service/ESPurpleICQAccount.m
--- a/Plugins/Purple Service/ESPurpleICQAccount.m Fri Apr 15 09:34:42 2011 -0500
+++ b/Plugins/Purple Service/ESPurpleICQAccount.m Sun Apr 17 12:51:21 2011 +0200
@@ -58,15 +58,14 @@
//Defaults to NO - web_aware will cause lots of spam for many users!
purple_account_set_bool(account, "web_aware", [[self preferenceForKey:KEY_ICQ_WEB_AWARE group:GROUP_ACCOUNT_STATUS] boolValue]);
+}
- // Always yes, so SSL works again.
- purple_account_set_bool(account, "use_clientlogin", TRUE);
-
- if ([[self preferenceForKey:PREFERENCE_SSL_CONNECTION group:GROUP_ACCOUNT_STATUS] boolValue]) {
- purple_account_set_string(account, "encryption", "opportunistic_encryption");
- } else {
- purple_account_set_string(account, "encryption", "no_encryption");
- }
+- (void)migrateSSL
+{
+ // SSL was forced off in the 1.4.1 update. Because "require SSL" will fail, migrate everyone to opportunistic encryption
+ [self setPreference:PREFERENCE_ENCRYPTION_TYPE_OPPORTUNISTIC
+ forKey:PREFERENCE_ENCRYPTION_TYPE
+ group:GROUP_ACCOUNT_STATUS];
}
#pragma mark Contact updates
diff -r 1f94c71dda38 -r e9f94c290817 Plugins/Purple Service/en.lproj/ESPurpleAIMAccountView.nib/designable.nib
--- a/Plugins/Purple Service/en.lproj/ESPurpleAIMAccountView.nib/designable.nib Fri Apr 15 09:34:42 2011 -0500
+++ b/Plugins/Purple Service/en.lproj/ESPurpleAIMAccountView.nib/designable.nib Sun Apr 17 12:51:21 2011 +0200
@@ -2,17 +2,17 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">823</string>
+ <string key="IBDocument.SystemVersion">10J869</string>
+ <string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
- <string key="IBDocument.HIToolboxVersion">462.00</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">823</string>
+ <string key="NS.object.0">762</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="130"/>
+ <integer value="259"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -213,6 +213,7 @@
</object>
<string key="NSFrame">{{1, 1}, {284, 115}}</string>
<reference key="NSSuperview" ref="669945228"/>
+ <reference key="NSNextKeyView" ref="114637136"/>
<reference key="NSDocView" ref="114637136"/>
<reference key="NSBGColor" ref="255340051"/>
<object class="NSCursor" key="NSCursor">
@@ -244,6 +245,7 @@
</object>
<string key="NSFrame">{{54, 0}, {286, 117}}</string>
<reference key="NSSuperview" ref="286790469"/>
+ <reference key="NSNextKeyView" ref="281511881"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="441982314"/>
<reference key="NSHScroller" ref="498343748"/>
@@ -261,10 +263,220 @@
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSMatrix" id="240176080">
+ <reference key="NSNextResponder" ref="309368922"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{123, 22}, {322, 58}}</string>
+ <reference key="NSSuperview" ref="309368922"/>
+ <bool key="NSEnabled">YES</bool>
+ <int key="NSNumRows">3</int>
+ <int key="NSNumCols">1</int>
+ <object class="NSMutableArray" key="NSCells">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButtonCell" id="510740642">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">No encryption</string>
+ <reference key="NSSupport" ref="809168851"/>
+ <reference key="NSControlView" ref="240176080"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <object class="NSButtonImageSource" key="NSAlternateImage" id="404150633">
+ <string key="NSImageName">NSRadioButton</string>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ <object class="NSButtonCell" id="564890599">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Use encryption when available</string>
+ <reference key="NSSupport" ref="809168851"/>
+ <reference key="NSControlView" ref="240176080"/>
+ <int key="NSTag">1</int>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <object class="NSImage" key="NSNormalImage">
+ <int key="NSImageFlags">549453824</int>
+ <string key="NSSize">{18, 18}</string>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">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
+AAAAAF1KAAA0kQAACCVYWVogAAAAAAAAdCAAALRgAAAjPVhZWiAAAAAAAAAlbAAAFyoAAKfDWFlaIAAA
+AAAAAPNSAAEAAAABFs9zZjMyAAAAAAABDEIAAAXe///zJgAAB5IAAP2R///7ov///aMAAAPcAADAbGN1
+cnYAAAAAAAAAAQHNAABjdXJ2AAAAAAAAAAEBzQAAY3VydgAAAAAAAAABAc0AAHZjZ3QAAAAAAAAAAAAD
+AQAAAQACBAUGBwkKCw0ODxASExQWFxgaGxweHyAiIyQmJygpKywtLzAxMjM1Njc4OTs8PT5AQUJDREZH
+SElKS0xOT1BRUlNUVVZXWFlaW1xdXl9hYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5ent8fX5/gIGCg4SF
+hoeIiYqLjI2Oj5CRkpOUlZaXmJmam5ydnZ6foKGio6SlpqanqKmqq6ytra6vsLGysrO0tba3uLi5uru8
+vL2+v8DBwcLDxMXGxsfIycrKy8zNzs7P0NHS0tPU1dbW19jZ2drb3Nzd3t/g4eLi4+Tl5ufo6enq6+zt
+7u/w8fHy8/T19vf4+fr7/P3+/v8AAgMEBQYHCAkKCwwNDg8QERITFBUWFxgZGhscHR8gISIjJCUnKCkq
+Ky0uLzAxMzQ1Njc4OTo7PD0/QEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaWltcXV5fYGFiY2RlZmdo
+aWprbG1ub3BxcnN0dXZ3d3h5ent8fH1+f4CBgoKDhIWGh4iIiYqLjI2Oj5CRkpOUlJWWl5iZmpucnZ2e
+n6ChoqOkpaamp6ipqqusra6vsLCxsrO0tba3uLm5uru8vb6/wMHCw8TFx8jJysvMzc7P0NDR0tPU1dbX
+2Nna29ze3+Dh4uPk5ebn6err7O3u7/Hy8/T19vf5+vv8/f7/AAIDAwQFBgcICQoKCwwNDg8QERITFBUW
+FxgZGhscHR4fICEiIyQlJicoKSorLC0uLzAxMjM0NTY3ODg5Ojs8PT4+P0BBQkNDREVGR0hJSUpLTE1O
+Tk9QUVJSU1RVVVZXWFhZWltbXF1eXl9gYWFiY2RkZWZnZ2hpaWprbGxtbm5vcHFxcnNzdHV1dnd4eHl6
+ent8fH1+fn+AgYGCg4SEhYaHiImJiouMjY6Oj5CRkpOTlJWWl5iZmZqbnJ2en6ChoqOkpaanqKmqq6yt
+rq+xsrO0tba3uLq7vL2+wMHDxMbHycrMzs/R0tTW19nb3d7g4uTm6Ors7vDy9Pb4+vz+/wAAbmRpbgAA
+AAAAAAY2AACXGgAAVjoAAFPKAACJ3gAAJ8IAABaoAABQDQAAVDkAAiuFAAIZmQABeFEAAwEAAAIAAAAA
+AAEABgANABcAIwAxAEAAUgBlAHsAkwCrAMUA4gD/AR8BPwFhAYUBqgHQAfgCIAJLAncCpQLSAwIDMwNl
+A5gDzgQFBD0EdQSvBOsFKQVnBacF6AYqBm4GtQb8B0UHkgfkCDkIkAjnCT4JmAn0ClAKrQsLC2sLygwq
+DIwM8Q1XDcAOKA6SDv4PbA/bEE0QxBE7EbQSMRKwEzITuRREFNAVYBXxFocXHhfAGGIZBBmsGlQa+RuU
+HC4czh1yHhQeux9jIA0gvCFoIhkizyOJJEEk+SW6JnknOygFKMspkypiKzIsASzXLawuhy9gMD4xGzH8
+MtszvzSgNYY2cjdcOEw5OTorOxs8CD0EPfU+6z/nQOFB2ELUQ9VE00XcRttH5EjxSgBLCUwdTTFOUE9v
+UI9Rt1LdVAVVNlZsV6VY4FohW21ct135X09goGH0Y0tkqGYFZ19oxGova5ptCG54b/BxbnLsdG119Xd/
+eQh6knwqfcV/W4D4gpSEO4Xih4CJKorYjIqOOY/jkZuTWJUOlsyYiZpSnB6d4Z+soX+jWqUvpxOo+6rj
+rMuuwLC4sra0rra0uL+60LzfvwDBHcLdxLXGhchYyi7MCs3lz7rRmtOA1WPXR9kq2xPc/97s4M/iveSn
+5o3obupT7ELuLPAM8fLz0PW396H5f/tZ/T3//wAAAAEAAwALABYAJQA3AE0AZQCBAJ8AwQDlAQsBNQFh
+AZABwQH1AisCZAKfAtwDHANfA6MD6gQ0BH8EzQT1BR0FcAXEBhsGdAbPBy0HXAeMB+4IUgi4CSAJVAmK
+CfYKZArVC0cLgQu8DDIMqw0mDaIOIQ6hDyQPqRAvELgQ/RFDEc8SXRLuE4AUFRSrFUMV3RZ5FxcXthhY
+GPwZoRpIGvEbnBxJHPgdqB5bHw8fxSB9ITch8iKwJDAk8yW3Jn4nRigQKNwpqSp5K0osHCzxLccuoC95
+MFUxMzISMvMz1TS5NaA2hzdxOFw5STo4Oyg8Gj4DPvs/9EDuQepD6ETpRexG8Uf3SP9LFEwhTTBOQE9S
+UGZSklOrVMVV4Vb/WB5ZP1phW4Vcq13SXvthUmJ/Y69k4GYSZ0dofGm0au1tZG6ib+FxInJlc6l073Y2
+d396FXtjfLJ+A39VgKmB/4NWhK+GCYjCiiGLgYzjjkePrJESknuT5Ja8mCuZm5sMnH+d9J9qoOGiWqPV
+pVGmz6eOqE6pzqtRrNSuWq/gsWmy8rR+tgu5Kbq6vE294b93wQ7Cp8RBxd3He8kZyrrLisxbzf/Po9FK
+0vHUm9ZF1/HZn9tO3Cbc/96x4GTiGePQ5YjnQegf6Pzquex27jbv9/G583z0X/VC9wj40Pqa/GX+Mf//
+AAAAAQADAAsAJQA3AE0AZQCBAJ8AwQELATUBYQGQAcEB9QIrAmQCnwLcAxwDXwOjA+oENAR/BM0FHQVw
+BcQGGwZ0Bs8HLQeMB+4IUgi4CSAJign2CmQK1QtHC7wMMgyrDSYNog4hDqEPJA+pEC8QuBFDEl0S7hOA
+FBUUqxVDFnkXFxe2GFgY/BpIGvEbnBxJHPgdqB8PH8UgfSE3IfIjbyQwJPMltydGKBAo3Cp5K0osHC3H
+LqAveTEzMhIy8zS5NaA2hzhcOUk6ODwaPQ4+Az/0QO5C6EPoROlG8Uf3SglLFEwhTkBPUlF7UpJUxVXh
+Vv9ZP1phXKtd0mAlYVJjr2TgZhJofGm0au1tZG6ib+FxInJldO92Nnd/eMl6FXyyfgN/VYCpgf+Er4YJ
+h2WIwoohi4GOR4+skRKSe5PklVCWvJgrmZubDJx/nfSfaqDholqj1aVRps+oTqnOq1Gs1K2Xrlqv4LFp
+svK0frYLt5m5Kbnxurq8Tb3hv3fBDsHawqfEQcUPxd3He8hKyRnKusuKzFvN/87Rz6PQdtFK0vHTxtSb
+1kXXG9fx2MjZn9tO3Cbc/93Y3rHfiuBk4hni9ePQ5KzliOZk50HoH+j86drqueuX7HbtVu427xbv9/DX
+8bnymvN89F/1QvYl9wj37PjQ+bX6mvt//GX9S/4x//8AAGRlc2MAAAAAAAAACkNvbG9yIExDRAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAEAAAAMZW5VUwAAABIAAAAcAEMAbwBsAG8AcgAgAEwAQwBE
+AABtbW9kAAAAAAAABhAAAJxOAAAAAL5zkQAAAAAAAAAAAAAAAAAAAAAAdGV4dAAAAABDb3B5cmlnaHQg
+QXBwbGUgQ29tcHV0ZXIsIEluYy4sIDIwMDUAAAAAA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <object class="NSColor" key="NSColor" id="484733094">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MCAwAA</bytes>
+ </object>
+ </object>
+ <reference key="NSAlternateImage" ref="404150633"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <object class="NSButtonCell" id="680481545">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Require encryption</string>
+ <reference key="NSSupport" ref="809168851"/>
+ <reference key="NSControlView" ref="240176080"/>
+ <int key="NSTag">2</int>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <reference key="NSAlternateImage" ref="404150633"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ </object>
+ <string key="NSCellSize">{322, 18}</string>
+ <string key="NSIntercellSpacing">{4, 2}</string>
+ <int key="NSMatrixFlags">1151868928</int>
+ <string key="NSCellClass">NSActionCell</string>
+ <object class="NSButtonCell" key="NSProtoCell" id="1024902640">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Radio</string>
+ <reference key="NSSupport" ref="809168851"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">0</int>
+ <object class="NSImage" key="NSNormalImage">
+ <int key="NSImageFlags">549453824</int>
+ <string key="NSSize">{18, 18}</string>
+ <object class="NSMutableArray" key="NSReps">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+ </object>
+ </object>
+ </object>
+ </object>
+ <reference key="NSColor" ref="484733094"/>
+ </object>
+ <reference key="NSAlternateImage" ref="404150633"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <reference key="NSSelectedCell" ref="510740642"/>
+ <reference key="NSBackgroundColor" ref="785911142"/>
+ <reference key="NSCellBackgroundColor" ref="255340051"/>
+ <reference key="NSFont" ref="809168851"/>
+ </object>
<object class="NSButton" id="606541730">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{123, -1}, {306, 18}}</string>
+ <string key="NSFrame">{{123, -2}, {306, 18}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="396178306">
@@ -291,7 +503,7 @@
<object class="NSTextField" id="138243753">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{-20, 0}, {140, 17}}</string>
+ <string key="NSFrame">{{-20, -1}, {140, 17}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="860735205">
@@ -307,7 +519,7 @@
<object class="NSButton" id="635769229">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{123, 73}, {306, 18}}</string>
+ <string key="NSFrame">{{123, 112}, {306, 18}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="616543444">
@@ -329,7 +541,7 @@
<object class="NSButton" id="383137610">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{123, 48}, {326, 18}}</string>
+ <string key="NSFrame">{{123, 87}, {326, 18}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="224966976">
@@ -348,32 +560,10 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="880900466">
- <reference key="NSNextResponder" ref="309368922"/>
- <int key="NSvFlags">264</int>
- <string key="NSFrame">{{123, 23}, {306, 18}}</string>
- <reference key="NSSuperview" ref="309368922"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="726682526">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Encrypt connection using SSL</string>
- <reference key="NSSupport" ref="809168851"/>
- <reference key="NSControlView" ref="880900466"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="743239603"/>
- <reference key="NSAlternateImage" ref="509293852"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSTextField" id="413658316">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{-20, 102}, {140, 17}}</string>
+ <string key="NSFrame">{{-20, 141}, {140, 17}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="547360562">
@@ -389,7 +579,7 @@
<object class="NSTextField" id="861814118">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{125, 99}, {200, 22}}</string>
+ <string key="NSFrame">{{125, 138}, {200, 22}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="695541870">
@@ -406,7 +596,7 @@
<object class="NSTextField" id="1734475">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{369, 99}, {51, 22}}</string>
+ <string key="NSFrame">{{369, 138}, {51, 22}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="164930019">
@@ -423,7 +613,7 @@
<object class="NSTextField" id="1058782019">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{330, 101}, {34, 17}}</string>
+ <string key="NSFrame">{{330, 140}, {34, 17}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="989341876">
@@ -439,7 +629,7 @@
<object class="NSTextField" id="818700861">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{-20, 74}, {140, 17}}</string>
+ <string key="NSFrame">{{-20, 113}, {140, 17}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="120141795">
@@ -455,7 +645,7 @@
<object class="NSTextField" id="583081460">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{-20, 49}, {140, 17}}</string>
+ <string key="NSFrame">{{-20, 88}, {140, 17}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="178085920">
@@ -471,13 +661,13 @@
<object class="NSTextField" id="794209045">
<reference key="NSNextResponder" ref="309368922"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{-20, 24}, {140, 17}}</string>
+ <string key="NSFrame">{{-20, 63}, {140, 17}}</string>
<reference key="NSSuperview" ref="309368922"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="316328674">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Security:</string>
+ <string key="NSContents">Encryption:</string>
<reference key="NSSupport" ref="809168851"/>
<reference key="NSControlView" ref="794209045"/>
<reference key="NSBackgroundColor" ref="785911142"/>
@@ -485,7 +675,7 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{447, 121}</string>
+ <string key="NSFrameSize">{447, 160}</string>
<reference key="NSSuperview"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
@@ -601,22 +791,6 @@
<int key="connectionID">206</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">changedPreference:</string>
- <reference key="source" ref="446524619"/>
- <reference key="destination" ref="880900466"/>
- </object>
- <int key="connectionID">207</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">checkBox_SSL</string>
- <reference key="source" ref="446524619"/>
- <reference key="destination" ref="880900466"/>
- </object>
- <int key="connectionID">225</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">checkBox_proxyServer</string>
<reference key="source" ref="446524619"/>
@@ -640,6 +814,38 @@
</object>
<int key="connectionID">248</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">radio_Encryption</string>
+ <reference key="source" ref="446524619"/>
+ <reference key="destination" ref="240176080"/>
+ </object>
+ <int key="connectionID">260</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToLeftSide</string>
+ <reference key="source" ref="510740642"/>
+ <reference key="destination" ref="794209045"/>
+ </object>
+ <int key="connectionID">261</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToLeftSide</string>
+ <reference key="source" ref="564890599"/>
+ <reference key="destination" ref="794209045"/>
+ </object>
+ <int key="connectionID">262</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_anchorToLeftSide</string>
+ <reference key="source" ref="680481545"/>
+ <reference key="destination" ref="794209045"/>
+ </object>
+ <int key="connectionID">264</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -739,10 +945,10 @@
<reference ref="818700861"/>
<reference ref="583081460"/>
<reference ref="383137610"/>
- <reference ref="880900466"/>
<reference ref="794209045"/>
<reference ref="138243753"/>
<reference ref="606541730"/>
+ <reference ref="240176080"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Options</string>
@@ -820,15 +1026,6 @@
<reference key="parent" ref="309368922"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">183</int>
- <reference key="object" ref="880900466"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="726682526"/>
- </object>
- <reference key="parent" ref="309368922"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">185</int>
<reference key="object" ref="794209045"/>
<object class="NSMutableArray" key="children">
@@ -893,11 +1090,6 @@
<reference key="parent" ref="383137610"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">239</int>
- <reference key="object" ref="726682526"/>
- <reference key="parent" ref="880900466"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">240</int>
<reference key="object" ref="316328674"/>
<reference key="parent" ref="794209045"/>
@@ -940,6 +1132,38 @@
<reference key="object" ref="860735205"/>
<reference key="parent" ref="138243753"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">255</int>
+ <reference key="object" ref="240176080"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="510740642"/>
+ <reference ref="564890599"/>
+ <reference ref="1024902640"/>
+ <reference ref="680481545"/>
+ </object>
+ <reference key="parent" ref="309368922"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">256</int>
+ <reference key="object" ref="510740642"/>
+ <reference key="parent" ref="240176080"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">257</int>
+ <reference key="object" ref="564890599"/>
+ <reference key="parent" ref="240176080"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">258</int>
+ <reference key="object" ref="1024902640"/>
+ <reference key="parent" ref="240176080"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">259</int>
+ <reference key="object" ref="680481545"/>
+ <reference key="parent" ref="240176080"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -982,8 +1206,6 @@
<string>179.ImportedFromIB2</string>
<string>181.IBPluginDependency</string>
<string>181.ImportedFromIB2</string>
- <string>183.IBPluginDependency</string>
- <string>183.ImportedFromIB2</string>
<string>185.IBPluginDependency</string>
<string>185.ImportedFromIB2</string>
<string>228.IBPluginDependency</string>
@@ -997,7 +1219,6 @@
<string>236.IBPluginDependency</string>
<string>237.IBPluginDependency</string>
<string>238.IBPluginDependency</string>
- <string>239.IBPluginDependency</string>
<string>240.IBPluginDependency</string>
<string>241.IBPluginDependency</string>
<string>241.IBShouldRemoveOnLegacySave</string>
@@ -1009,6 +1230,14 @@
<string>244.ImportedFromIB2</string>
<string>245.IBPluginDependency</string>
<string>246.IBPluginDependency</string>
+ <string>255.IBPluginDependency</string>
+ <string>256.CustomClassName</string>
+ <string>256.IBPluginDependency</string>
+ <string>257.CustomClassName</string>
+ <string>257.IBPluginDependency</string>
+ <string>258.CustomClassName</string>
+ <string>258.IBPluginDependency</string>
+ <string>259.CustomClassName</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1029,7 +1258,7 @@
<string>AIAutoScrollView</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
- <string>{{21, 601}, {447, 121}}</string>
+ <string>{{21, 562}, {447, 160}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1051,9 +1280,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1075,6 +1301,14 @@
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>AILocalizationButtonCell</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>AILocalizationButtonCell</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>AILocalizationButtonCell</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>AILocalizationButtonCell</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -1093,7 +1327,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">248</int>
+ <int key="maxID">264</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1105,13 +1339,6 @@
<string key="NS.key.0">changedPreference:</string>
<string key="NS.object.0">id</string>
</object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">changedPreference:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">changedPreference:</string>
- <string key="candidateClassName">id</string>
- </object>
- </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -1165,128 +1392,9 @@
<string>NSView</string>
</object>
</object>
- <object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>checkBox_checkMail</string>
- <string>checkBox_sendTyping</string>
- <string>label_alias</string>
- <string>label_encryption</string>
- <string>label_password</string>
- <string>label_port</string>
- <string>label_server</string>
- <string>label_typing</string>
- <string>popUp_encryption</string>
- <string>progressIndicator_registering</string>
- <string>textField_accountUID</string>
- <string>textField_accountUIDLabel</string>
- <string>textField_alias</string>
- <string>textField_connectHost</string>
- <string>textField_connectPort</string>
- <string>textField_password</string>
- <string>textField_registering</string>
- <string>view_auxiliaryTabView</string>
- <string>view_options</string>
- <string>view_privacy</string>
- <string>view_profile</string>
- <string>view_setup</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_checkMail</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_sendTyping</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_alias</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_encryption</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_password</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_port</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_server</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">label_typing</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">popUp_encryption</string>
- <string key="candidateClassName">NSPopUpButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">progressIndicator_registering</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_accountUID</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_accountUIDLabel</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_alias</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_connectHost</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_connectPort</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_password</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_registering</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_auxiliaryTabView</string>
- <string key="candidateClassName">NSTabView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_options</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_privacy</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_profile</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_setup</string>
- <string key="candidateClassName">NSView</string>
- </object>
- </object>
- </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./classes-xjh84/AIAccountViewController.h</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIAccountViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1294,26 +1402,57 @@
<string key="superclassName">NSScrollView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./classes-xjh84/AIAutoScrollView.h</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIAutoScrollView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationButtonCell</string>
+ <string key="superclassName">NSButtonCell</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>view_anchorToLeftSide</string>
+ <string>view_anchorToRightSide</string>
+ <string>window_anchorOnLeftSide</string>
+ <string>window_anchorOnRightSide</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>NSView</string>
+ <string>NSView</string>
+ <string>NSWindow</string>
+ <string>NSWindow</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="26003996">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationButtonCell.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">AIMessageEntryTextView</string>
<string key="superclassName">AISendingTextView</string>
<object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">sendContent:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">sendContent:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">sendContent:</string>
- <string key="candidateClassName">id</string>
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>pasteAsPlainTextWithTraits:</string>
+ <string>pasteAsRichText:</string>
+ <string>scrollPageDown:</string>
+ <string>scrollPageUp:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
More information about the commits
mailing list