adium 3671:855cbc039a80: Add a preference to turn off direct con...
commits at adium.im
commits at adium.im
Fri Feb 18 20:58:02 UTC 2011
details: http://hg.adium.im/adium/rev/855cbc039a80
revision: 3671:855cbc039a80
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Fri Feb 18 21:42:09 2011 +0100
Add a preference to turn off direct connections on MSN.
Fixes #14602
diffs (truncated from 1997 to 1000 lines):
diff -r add0c83648a5 -r 855cbc039a80 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Fri Feb 18 15:44:06 2011 -0500
+++ b/Adium.xcodeproj/project.pbxproj Fri Feb 18 21:42:09 2011 +0100
@@ -9572,7 +9572,6 @@
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
diff -r add0c83648a5 -r 855cbc039a80 Plugins/Purple Service/ESPurpleMSNAccount.h
--- a/Plugins/Purple Service/ESPurpleMSNAccount.h Fri Feb 18 15:44:06 2011 -0500
+++ b/Plugins/Purple Service/ESPurpleMSNAccount.h Fri Feb 18 21:42:09 2011 +0100
@@ -17,8 +17,9 @@
#import "CBPurpleAccount.h"
#import "ESMSNService.h"
-#define KEY_MSN_HTTP_CONNECT_METHOD @"MSN:HTTP Connect Method"
-#define KEY_MSN_DISPLAY_NAMED_CHANGED @"MSN:Display Name Changed"
+#define KEY_MSN_HTTP_CONNECT_METHOD @"MSN:HTTP Connect Method"
+#define KEY_MSN_DISPLAY_NAMED_CHANGED @"MSN:Display Name Changed"
+#define KEY_MSN_BLOCK_DIRECT_CONNECTIONS @"MSN:Block Direct Connections"
@interface ESPurpleMSNAccount : CBPurpleAccount <AIAccount_Files>{
NSDate *lastFriendlyNameChange;
diff -r add0c83648a5 -r 855cbc039a80 Plugins/Purple Service/ESPurpleMSNAccount.m
--- a/Plugins/Purple Service/ESPurpleMSNAccount.m Fri Feb 18 15:44:06 2011 -0500
+++ b/Plugins/Purple Service/ESPurpleMSNAccount.m Fri Feb 18 21:42:09 2011 +0100
@@ -146,6 +146,9 @@
BOOL HTTPConnect = [[self preferenceForKey:KEY_MSN_HTTP_CONNECT_METHOD group:GROUP_ACCOUNT_STATUS] boolValue];
purple_account_set_bool(account, "http_method", HTTPConnect);
+
+ BOOL blockDirectConnections = [[self preferenceForKey:KEY_MSN_BLOCK_DIRECT_CONNECTIONS group:GROUP_ACCOUNT_STATUS] boolValue];
+ purple_account_set_bool(account, "direct_connect", !blockDirectConnections);
}
- (NSString *)connectionStringForStep:(NSInteger)step
diff -r add0c83648a5 -r 855cbc039a80 Plugins/Purple Service/ESPurpleMSNAccountViewController.h
--- a/Plugins/Purple Service/ESPurpleMSNAccountViewController.h Fri Feb 18 15:44:06 2011 -0500
+++ b/Plugins/Purple Service/ESPurpleMSNAccountViewController.h Fri Feb 18 21:42:09 2011 +0100
@@ -20,6 +20,7 @@
IBOutlet NSTextField *textField_friendlyName;
IBOutlet NSButton *checkBox_HTTPConnectMethod;
+ IBOutlet NSButton *checkbox_allowDirectConnections;
}
@end
diff -r add0c83648a5 -r 855cbc039a80 Plugins/Purple Service/ESPurpleMSNAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleMSNAccountViewController.m Fri Feb 18 15:44:06 2011 -0500
+++ b/Plugins/Purple Service/ESPurpleMSNAccountViewController.m Fri Feb 18 21:42:09 2011 +0100
@@ -32,6 +32,10 @@
[checkBox_HTTPConnectMethod setState:[[account preferenceForKey:KEY_MSN_HTTP_CONNECT_METHOD
group:GROUP_ACCOUNT_STATUS] boolValue]];
+
+ // negated preference, default => allowed
+ [checkbox_allowDirectConnections setState:![[account preferenceForKey:KEY_MSN_BLOCK_DIRECT_CONNECTIONS
+ group:GROUP_ACCOUNT_STATUS] boolValue]];
}
//Save controls
@@ -40,6 +44,9 @@
[account setPreference:[NSNumber numberWithBool:[checkBox_HTTPConnectMethod state]]
forKey:KEY_MSN_HTTP_CONNECT_METHOD group:GROUP_ACCOUNT_STATUS];
+ [account setPreference:[NSNumber numberWithBool:![checkbox_allowDirectConnections state]]
+ forKey:KEY_MSN_BLOCK_DIRECT_CONNECTIONS group:GROUP_ACCOUNT_STATUS];
+
//Alias
if (!account.online &&
![[textField_alias stringValue] isEqualToString:[[NSAttributedString stringWithData:[account preferenceForKey:KEY_ACCOUNT_DISPLAY_NAME
@@ -47,6 +54,7 @@
[account setPreference:[NSNumber numberWithBool:YES]
forKey:KEY_DISPLAY_CUSTOM_EMOTICONS
group:GROUP_ACCOUNT_STATUS];
+
}
[super saveConfiguration];
diff -r add0c83648a5 -r 855cbc039a80 Plugins/Purple Service/en.lproj/ESPurpleMSNAccountView.nib/designable.nib
--- a/Plugins/Purple Service/en.lproj/ESPurpleMSNAccountView.nib/designable.nib Fri Feb 18 15:44:06 2011 -0500
+++ b/Plugins/Purple Service/en.lproj/ESPurpleMSNAccountView.nib/designable.nib Fri Feb 18 21:42:09 2011 +0100
@@ -3,25 +3,16 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">1278</string>
+ <string key="IBDocument.InterfaceBuilderVersion">762</string>
<string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">462.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">1278</string>
+ <string key="NS.object.0">762</string>
</object>
- <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSTextField</string>
- <string>NSCustomObject</string>
- <string>NSMenu</string>
- <string>NSMenuItem</string>
- <string>NSPopUpButton</string>
- <string>NSCustomView</string>
- <string>NSButtonCell</string>
- <string>NSPopUpButtonCell</string>
- <string>NSButton</string>
- <string>NSTextFieldCell</string>
+ <integer value="29"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -32,7 +23,9 @@
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="766975530">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -46,25 +39,52 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="310894834">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">258</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButton" id="280124738">
+ <reference key="NSNextResponder" ref="310894834"/>
+ <int key="NSvFlags">264</int>
+ <string key="NSFrame">{{140, 41}, {273, 18}}</string>
+ <reference key="NSSuperview" ref="310894834"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="31537272">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Allow direct connections</string>
+ <object class="NSFont" key="NSSupport" id="52396734">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">13</double>
+ <int key="NSfFlags">1044</int>
+ </object>
+ <reference key="NSControlView" ref="280124738"/>
+ <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags2">2</int>
+ <object class="NSCustomResource" key="NSNormalImage" id="911593528">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSSwitch</string>
+ </object>
+ <object class="NSButtonImageSource" key="NSAlternateImage" id="646449339">
+ <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="NSTextField" id="721304768">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{386, 71}, {51, 22}}</string>
+ <string key="NSFrame">{{386, 85}, {51, 22}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="224399399">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents"/>
- <object class="NSFont" key="NSSupport" id="52396734">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
- </object>
+ <reference key="NSSupport" ref="52396734"/>
<reference key="NSControlView" ref="721304768"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor" id="1057724024">
@@ -90,7 +110,7 @@
<object class="NSTextField" id="264099923">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{-3, 73}, {140, 17}}</string>
+ <string key="NSFrame">{{-3, 87}, {140, 17}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="26284219">
@@ -119,7 +139,7 @@
<object class="NSTextField" id="459276419">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{142, 71}, {200, 22}}</string>
+ <string key="NSFrame">{{142, 85}, {200, 22}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="877816345">
@@ -136,7 +156,7 @@
<object class="NSButton" id="405762271">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{140, 23}, {273, 18}}</string>
+ <string key="NSFrame">{{140, 21}, {273, 18}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="636701001">
@@ -147,13 +167,8 @@
<reference key="NSControlView" ref="405762271"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="801268078">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSSwitch</string>
- </object>
- <object class="NSButtonImageSource" key="NSAlternateImage" id="646449339">
- <string key="NSImageName">NSSwitch</string>
- </object>
+ <reference key="NSNormalImage" ref="911593528"/>
+ <reference key="NSAlternateImage" ref="646449339"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
@@ -163,7 +178,7 @@
<object class="NSTextField" id="148039661">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{-3, 24}, {140, 17}}</string>
+ <string key="NSFrame">{{-3, 22}, {140, 17}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1069097413">
@@ -179,7 +194,7 @@
<object class="NSTextField" id="190693781">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{347, 73}, {34, 17}}</string>
+ <string key="NSFrame">{{347, 87}, {34, 17}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1068509127">
@@ -195,7 +210,7 @@
<object class="NSButton" id="673071534">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">264</int>
- <string key="NSFrame">{{140, 47}, {273, 18}}</string>
+ <string key="NSFrame">{{140, 61}, {273, 18}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="236028712">
@@ -206,7 +221,7 @@
<reference key="NSControlView" ref="673071534"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="801268078"/>
+ <reference key="NSNormalImage" ref="911593528"/>
<reference key="NSAlternateImage" ref="646449339"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -217,7 +232,7 @@
<object class="NSTextField" id="101949784">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{63, 0}, {74, 17}}</string>
+ <string key="NSFrame">{{63, 2}, {74, 17}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="796623666">
@@ -233,7 +248,7 @@
<object class="NSButton" id="813455243">
<reference key="NSNextResponder" ref="310894834"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{140, -1}, {188, 18}}</string>
+ <string key="NSFrame">{{140, 1}, {188, 18}}</string>
<reference key="NSSuperview" ref="310894834"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="641216641">
@@ -244,7 +259,7 @@
<reference key="NSControlView" ref="813455243"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="801268078"/>
+ <reference key="NSNormalImage" ref="911593528"/>
<reference key="NSAlternateImage" ref="646449339"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -253,7 +268,8 @@
</object>
</object>
</object>
- <string key="NSFrameSize">{437, 93}</string>
+ <string key="NSFrameSize">{437, 107}</string>
+ <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
</object>
@@ -319,7 +335,7 @@
<reference key="NSControlView" ref="1055404896"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="801268078"/>
+ <reference key="NSNormalImage" ref="911593528"/>
<reference key="NSAlternateImage" ref="646449339"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -443,7 +459,7 @@
<reference key="NSControlView" ref="908833182"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="801268078"/>
+ <reference key="NSNormalImage" ref="911593528"/>
<reference key="NSAlternateImage" ref="646449339"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -702,6 +718,14 @@
</object>
<int key="connectionID">282</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">checkbox_allowDirectConnections</string>
+ <reference key="source" ref="745797483"/>
+ <reference key="destination" ref="280124738"/>
+ </object>
+ <int key="connectionID">304</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -738,12 +762,13 @@
<reference ref="721304768"/>
<reference ref="264099923"/>
<reference ref="459276419"/>
- <reference ref="405762271"/>
- <reference ref="148039661"/>
<reference ref="190693781"/>
<reference ref="673071534"/>
+ <reference ref="280124738"/>
+ <reference ref="405762271"/>
+ <reference ref="813455243"/>
+ <reference ref="148039661"/>
<reference ref="101949784"/>
- <reference ref="813455243"/>
</object>
<reference key="parent" ref="0"/>
<string key="objectName">Options</string>
@@ -1030,20 +1055,33 @@
<reference key="object" ref="182596616"/>
<reference key="parent" ref="170806723"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">302</int>
+ <reference key="object" ref="280124738"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="31537272"/>
+ </object>
+ <reference key="parent" ref="310894834"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">303</int>
+ <reference key="object" ref="31537272"/>
+ <reference key="parent" ref="280124738"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>-1.IBPluginDependency</string>
- <string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>-3.ImportedFromIB2</string>
<string>183.IBPluginDependency</string>
<string>183.ImportedFromIB2</string>
<string>186.IBPluginDependency</string>
<string>186.ImportedFromIB2</string>
+ <string>187.IBEditorWindowLastContentRect</string>
<string>187.IBPluginDependency</string>
<string>187.ImportedFromIB2</string>
<string>197.IBPluginDependency</string>
@@ -1108,17 +1146,19 @@
<string>299.IBPluginDependency</string>
<string>300.IBPluginDependency</string>
<string>301.IBPluginDependency</string>
+ <string>302.IBPluginDependency</string>
+ <string>302.ImportedFromIB2</string>
+ <string>303.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
+ <string>{{126, 772}, {341, 104}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1168,7 +1208,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{156, 833}, {437, 93}}</string>
+ <string>{{62, 583}, {437, 107}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1183,21 +1223,28 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES"/>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <reference key="dict.values" ref="0"/>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ </object>
</object>
<nil key="sourceID"/>
- <int key="maxID">301</int>
+ <int key="maxID">304</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1209,13 +1256,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">
@@ -1269,128 +1309,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/AIAccountViewController.h</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIAccountViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1413,38 +1334,9 @@
<string>NSWindow</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>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>
- <object class="IBToOneOutletInfo">
- <string key="name">view_anchorToLeftSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_anchorToRightSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">window_anchorOnLeftSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">window_anchorOnRightSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="161917896">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AILocalizationButton.h</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1467,38 +1359,9 @@
<string>NSWindow</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>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>
- <object class="IBToOneOutletInfo">
- <string key="name">view_anchorToLeftSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">view_anchorToRightSide</string>
- <string key="candidateClassName">NSView</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">window_anchorOnLeftSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">window_anchorOnRightSide</string>
- <string key="candidateClassName">NSWindow</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="301009142">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AILocalizationTextField.h</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationTextField.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1509,7 +1372,7 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>checkBox_HTTPConnectMethod</string>
- <string>checkBox_displayCustomEmoticons</string>
+ <string>checkbox_allowDirectConnections</string>
<string>textField_friendlyName</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -1519,33 +1382,201 @@
<string>NSTextField</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_HTTPConnectMethod</string>
- <string>checkBox_displayCustomEmoticons</string>
- <string>textField_friendlyName</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_HTTPConnectMethod</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">checkBox_displayCustomEmoticons</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_friendlyName</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Plugins/Purple Service/ESPurpleMSNAccountViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSApplication</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSButton</string>
+ <reference key="sourceIdentifier" ref="161917896"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSButtonCell</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationButtonCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSCell</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="545564902">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSMenu</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="712568233">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSMenuItem</string>
+ <reference key="sourceIdentifier" ref="712568233"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIDividedAlternatingRowOutlineView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIMultiCellOutlineView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIObjectAdditions.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIToolbarTabView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIToolbarUtilities.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIVariableHeightFlexibleColumnsOutlineView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <reference key="sourceIdentifier" ref="545564902"/>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">toggleFindPanel:</string>
+ <string key="NS.object.0">id</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/ESPurpleMSNAccountViewController.h</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIAbstractListController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIAccountControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AICustomSocialNetworkingStatusWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIEditStateWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">adiumPrint:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIInterfaceControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationAssistance.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIMenuControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/AIPreferenceControllerProtocol.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESContactAlertsViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESPresetManagementController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESPresetNameSheetController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/JVFontPreviewField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">prefsWindowWillClose:</string>
+ <string key="NS.object.0">SS_PrefsController</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="921948956">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/Adium Framework/Source/SS_PrefsController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1554,58 +1585,230 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>adiumPrint:</string>
<string>didAdjustSubviews:</string>
- <string>prefsWindowWillClose:</string>
- <string>toggleFindPanel:</string>
<string>willAdjustSubviews:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>id</string>
<string>RBSplitView</string>
- <string>SS_PrefsController</string>
- <string>id</string>
<string>RBSplitView</string>
</object>
</object>
- <object class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBClassDescriptionSource" key="sourceIdentifier" id="601446043">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/RBSplitView/Source/RBSplitView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/ShortcutRecorder/Source/SRRecorderCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/ShortcutRecorder/Source/SRRecorderControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Frameworks/ShortcutRecorder/Source/SRValidator.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Plugins/Purple Service/SLPurpleCocoaAdapter.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Plugins/WebKit Message View/ESWebView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">selectGroup:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AIContactController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">selectedEncryptionPreference:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/AIContentController.h</string>
+ </object>
More information about the commits
mailing list