adium 5905:da95f3976785: Trying to deal with authentication fail...
commits at adium.im
commits at adium.im
Wed Apr 1 12:05:21 UTC 2015
details: http://hg.adium.im/adium/rev/da95f3976785
revision: 5905:da95f3976785
branch: GoogleOAuth2
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Apr 01 14:05:03 2015 +0200
Trying to deal with authentication failures by prompting the user again.
diffs (truncated from 1553 to 1000 lines):
diff -r ad40ec511e77 -r da95f3976785 Plugins/Purple Service/AIPurpleGTalkAccount.m
--- a/Plugins/Purple Service/AIPurpleGTalkAccount.m Wed Apr 01 13:21:11 2015 +0200
+++ b/Plugins/Purple Service/AIPurpleGTalkAccount.m Wed Apr 01 14:05:03 2015 +0200
@@ -194,8 +194,6 @@
AILogWithSignature(@"%@", responseDict);
- [[adium accountController] setPassword:[responseDict objectForKey:@"access_token"] forAccount:self];
-
if (!self.UID.length) {
NSString *jsonWebToken = [responseDict objectForKey:@"id_token"];
@@ -228,12 +226,40 @@
error:NULL];
}
+ [password release];
+ password = [[responseDict objectForKey:@"access_token"] retain];
+
[self setGTalkMechEnabled:YES];
[super connect];
}
-(void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
- AILogWithSignature(@"did fail");
+ [self setLastDisconnectionError:[NSString stringWithFormat:@"OAuth authentication failed: %@", error.description]];
+ [self setValue:[NSNumber numberWithBool:YES] forProperty:@"isDisconnecting" notify:NotifyNow];
+}
+
+- (void)retrievePasswordThenConnect
+{
+ if ([self boolValueForProperty:@"Prompt For Password On Next Connect"] ||
+ [self boolValueForProperty:@"mustPromptForPasswordOnNextConnect"]) {
+ [adium.accountController editAccount:self onWindow:nil notifyingTarget:self];
+
+ } else {
+ /* Retrieve the user's password. Never prompt for a password, as we'll implement our own authorization handling
+ * if the password can't be retrieved.
+ */
+ [adium.accountController passwordForAccount:self
+ promptOption:AIPromptNever
+ notifyingTarget:self
+ selector:@selector(passwordReturnedForConnect:returnCode:context:)
+ context:nil];
+ }
+}
+
+- (void)editAccountSheetDidEndForAccount:(AIAccount *)inAccount withSuccess:(BOOL)successful {
+ if (successful) {
+ [self connect];
+ }
}
@end
diff -r ad40ec511e77 -r da95f3976785 Plugins/Purple Service/AIPurpleGTalkAccountViewController.h
--- a/Plugins/Purple Service/AIPurpleGTalkAccountViewController.h Wed Apr 01 13:21:11 2015 +0200
+++ b/Plugins/Purple Service/AIPurpleGTalkAccountViewController.h Wed Apr 01 14:05:03 2015 +0200
@@ -19,7 +19,6 @@
@interface AIPurpleGTalkAccountViewController : ESPurpleJabberAccountViewController {
IBOutlet NSTextField *textField_code;
- IBOutlet NSTextField *label_grant;
IBOutlet NSTextField *label_code;
}
diff -r ad40ec511e77 -r da95f3976785 Plugins/Purple Service/AIPurpleGTalkAccountViewController.m
--- a/Plugins/Purple Service/AIPurpleGTalkAccountViewController.m Wed Apr 01 13:21:11 2015 +0200
+++ b/Plugins/Purple Service/AIPurpleGTalkAccountViewController.m Wed Apr 01 14:05:03 2015 +0200
@@ -70,7 +70,6 @@
[[NSWorkspace sharedWorkspace] openURL:url];
- [label_grant setHidden:FALSE];
[label_code setHidden:FALSE];
[textField_code setHidden:FALSE];
}
diff -r ad40ec511e77 -r da95f3976785 Plugins/Purple Service/Resources/en.lproj/ESPurpleGTalkAccountView.nib/designable.nib
--- a/Plugins/Purple Service/Resources/en.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 13:21:11 2015 +0200
+++ b/Plugins/Purple Service/Resources/en.lproj/ESPurpleGTalkAccountView.nib/designable.nib Wed Apr 01 14:05:03 2015 +0200
@@ -45,16 +45,16 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSTextField" id="273440277">
+ <object class="NSTextField" id="848647082">
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{164, 20}, {273, 22}}</string>
+ <string key="NSFrame">{{164, 18}, {273, 22}}</string>
<reference key="NSSuperview" ref="837853317"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="263913129">
+ <object class="NSTextFieldCell" key="NSCell" id="620435019">
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
@@ -64,7 +64,7 @@
<int key="NSfFlags">1044</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="273440277"/>
+ <reference key="NSControlView" ref="848647082"/>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSColor" key="NSBackgroundColor" id="427835941">
<int key="NSColorSpace">6</int>
@@ -88,73 +88,13 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
</object>
- <object class="NSTextField" id="871711991">
- <reference key="NSNextResponder" ref="837853317"/>
- <int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{18, 25}, {140, 17}}</string>
- <reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="273440277"/>
- <string key="NSReuseIdentifierKey">_NS:526</string>
- <string key="NSHuggingPriority">{251, 750}</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="466605712">
- <int key="NSCellFlags">68157504</int>
- <int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Code:</string>
- <reference key="NSSupport" ref="745543233"/>
- <string key="NSCellIdentifier">_NS:526</string>
- <reference key="NSControlView" ref="871711991"/>
- <object class="NSColor" key="NSBackgroundColor" id="701108434">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor" id="835004027">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="316283793">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">labelColor</string>
- <reference key="NSColor" ref="38993316"/>
- </object>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
- </object>
- <object class="NSTextField" id="872477558">
- <reference key="NSNextResponder" ref="837853317"/>
- <int key="NSvFlags">-2147483380</int>
- <string key="NSFrame">{{18, 50}, {421, 17}}</string>
- <reference key="NSSuperview" ref="837853317"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="871711991"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <string key="NSAntiCompressionPriority">{250, 750}</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="132485513">
- <int key="NSCellFlags">67108864</int>
- <int key="NSCellFlags2">272629760</int>
- <string key="NSContents">Please grant Adium access to your account in your browser.</string>
- <reference key="NSSupport" ref="745543233"/>
- <string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="872477558"/>
- <reference key="NSBackgroundColor" ref="701108434"/>
- <reference key="NSTextColor" ref="316283793"/>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- <bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
- <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
- </object>
<object class="NSButton" id="272517914">
<reference key="NSNextResponder" ref="837853317"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{158, 68}, {140, 32}}</string>
+ <string key="NSFrame">{{158, 41}, {140, 32}}</string>
<reference key="NSSuperview" ref="837853317"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="872477558"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="712274320">
<int key="NSCellFlags">67108864</int>
@@ -174,8 +114,68 @@
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
+ <object class="NSTextField" id="659237171">
+ <reference key="NSNextResponder" ref="837853317"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{18, 77}, {421, 34}}</string>
+ <reference key="NSSuperview" ref="837853317"/>
+ <reference key="NSWindow"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <string key="NSAntiCompressionPriority">{250, 750}</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="956947149">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">272629760</int>
+ <string key="NSContents">You need to grant Adium access to your Google account in a web browser.</string>
+ <reference key="NSSupport" ref="745543233"/>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <reference key="NSControlView" ref="659237171"/>
+ <object class="NSColor" key="NSBackgroundColor" id="701108434">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">controlColor</string>
+ <object class="NSColor" key="NSColor" id="835004027">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+ </object>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="80670332">
+ <int key="NSColorSpace">6</int>
+ <string key="NSCatalogName">System</string>
+ <string key="NSColorName">labelColor</string>
+ <reference key="NSColor" ref="38993316"/>
+ </object>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <bool key="NSControlAutosetMaxLayoutWidth">YES</bool>
+ <double key="NSPreferredMaxLayoutWidth">417</double>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+ </object>
+ <object class="NSTextField" id="115016316">
+ <reference key="NSNextResponder" ref="837853317"/>
+ <int key="NSvFlags">-2147483380</int>
+ <string key="NSFrame">{{18, 20}, {140, 17}}</string>
+ <reference key="NSSuperview" ref="837853317"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="848647082"/>
+ <string key="NSReuseIdentifierKey">_NS:526</string>
+ <string key="NSHuggingPriority">{251, 750}</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="65556852">
+ <int key="NSCellFlags">68157504</int>
+ <int key="NSCellFlags2">71304192</int>
+ <string key="NSContents">Code:</string>
+ <reference key="NSSupport" ref="745543233"/>
+ <string key="NSCellIdentifier">_NS:526</string>
+ <reference key="NSControlView" ref="115016316"/>
+ <reference key="NSBackgroundColor" ref="701108434"/>
+ <reference key="NSTextColor" ref="80670332"/>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSTextFieldAlignmentRectInsetsVersion">1</int>
+ </object>
</array>
- <string key="NSFrameSize">{457, 116}</string>
+ <string key="NSFrameSize">{457, 131}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="272517914"/>
@@ -202,7 +202,7 @@
<reference key="NSControlView" ref="767871570"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
- <object class="NSCustomResource" key="NSNormalImage" id="196206009">
+ <object class="NSCustomResource" key="NSNormalImage" id="322361429">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSSwitch</string>
</object>
@@ -799,7 +799,7 @@
<reference key="NSControlView" ref="753162121"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="196206009"/>
+ <reference key="NSNormalImage" ref="322361429"/>
<reference key="NSAlternateImage" ref="10299655"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -834,7 +834,7 @@
<reference key="NSControlView" ref="8487197"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="196206009"/>
+ <reference key="NSNormalImage" ref="322361429"/>
<reference key="NSAlternateImage" ref="10299655"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -959,7 +959,7 @@
<reference key="NSControlView" ref="462740945"/>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="196206009"/>
+ <reference key="NSNormalImage" ref="322361429"/>
<reference key="NSAlternateImage" ref="10299655"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@@ -1230,23 +1230,15 @@
<object class="IBOutletConnection" key="connection">
<string key="label">textField_code</string>
<reference key="source" ref="393462939"/>
- <reference key="destination" ref="273440277"/>
+ <reference key="destination" ref="848647082"/>
</object>
<int key="connectionID">658</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">label_grant</string>
- <reference key="source" ref="393462939"/>
- <reference key="destination" ref="872477558"/>
- </object>
- <int key="connectionID">659</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">label_code</string>
<reference key="source" ref="393462939"/>
- <reference key="destination" ref="871711991"/>
+ <reference key="destination" ref="115016316"/>
</object>
<int key="connectionID">660</int>
</object>
@@ -1361,10 +1353,10 @@
<int key="objectID">39</int>
<reference key="object" ref="837853317"/>
<array class="NSMutableArray" key="children">
+ <reference ref="659237171"/>
<reference ref="272517914"/>
- <reference ref="872477558"/>
- <reference ref="871711991"/>
- <reference ref="273440277"/>
+ <reference ref="848647082"/>
+ <reference ref="115016316"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">setup</string>
@@ -1841,43 +1833,43 @@
<reference key="parent" ref="795157005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">648</int>
- <reference key="object" ref="872477558"/>
+ <int key="objectID">650</int>
+ <reference key="object" ref="115016316"/>
<array class="NSMutableArray" key="children">
- <reference ref="132485513"/>
- </array>
- <reference key="parent" ref="837853317"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">649</int>
- <reference key="object" ref="132485513"/>
- <reference key="parent" ref="872477558"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">650</int>
- <reference key="object" ref="871711991"/>
- <array class="NSMutableArray" key="children">
- <reference ref="466605712"/>
+ <reference ref="65556852"/>
</array>
<reference key="parent" ref="837853317"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">651</int>
- <reference key="object" ref="466605712"/>
- <reference key="parent" ref="871711991"/>
+ <reference key="object" ref="65556852"/>
+ <reference key="parent" ref="115016316"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">652</int>
- <reference key="object" ref="273440277"/>
+ <reference key="object" ref="848647082"/>
<array class="NSMutableArray" key="children">
- <reference ref="263913129"/>
+ <reference ref="620435019"/>
</array>
<reference key="parent" ref="837853317"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">653</int>
- <reference key="object" ref="263913129"/>
- <reference key="parent" ref="273440277"/>
+ <reference key="object" ref="620435019"/>
+ <reference key="parent" ref="848647082"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">662</int>
+ <reference key="object" ref="659237171"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="956947149"/>
+ </array>
+ <reference key="parent" ref="837853317"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">663</int>
+ <reference key="object" ref="956947149"/>
+ <reference key="parent" ref="659237171"/>
</object>
</array>
</object>
@@ -1924,7 +1916,7 @@
<string key="351.CustomClassName">AILocalizationButton</string>
<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference key="39.IBNSViewMetadataGestureRecognizers" ref="0"/>
- <string key="39.IBPersistedLastKnownCanvasPosition">{499.5, 419}</string>
+ <string key="39.IBPersistedLastKnownCanvasPosition">{499.5, 426.5}</string>
<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="411.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="527.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1962,21 +1954,1140 @@
<string key="642.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="643.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="644.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="648.IBNSControlSetsMaxLayoutWidthAtFirstLayoutMetadataKey"/>
- <string key="648.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="649.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="650.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="651.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="652.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="653.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES" key="662.IBNSControlSetsMaxLayoutWidthAtFirstLayoutMetadataKey"/>
+ <string key="662.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="663.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">661</int>
+ <int key="maxID">663</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes"/>
+ <object class="IBClassDescriber" key="IBDocument.Classes">
+ <array class="NSMutableArray" key="referencedPartialClassDescriptions">
+ <object class="IBPartialClassDescription">
+ <string key="className">AIAccountViewController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <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>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="checkBox_checkMail">NSButton</string>
+ <string key="checkBox_sendTyping">NSButton</string>
+ <string key="label_alias">NSTextField</string>
+ <string key="label_encryption">NSTextField</string>
+ <string key="label_password">NSTextField</string>
+ <string key="label_port">NSTextField</string>
+ <string key="label_server">NSTextField</string>
+ <string key="label_typing">NSTextField</string>
+ <string key="popUp_encryption">NSPopUpButton</string>
+ <string key="progressIndicator_registering">NSProgressIndicator</string>
+ <string key="textField_accountUID">NSTextField</string>
+ <string key="textField_accountUIDLabel">NSTextField</string>
+ <string key="textField_alias">NSTextField</string>
+ <string key="textField_connectHost">NSTextField</string>
+ <string key="textField_connectPort">NSTextField</string>
+ <string key="textField_password">NSTextField</string>
+ <string key="textField_registering">NSTextField</string>
+ <string key="view_auxiliaryTabView">NSTabView</string>
+ <string key="view_options">NSView</string>
+ <string key="view_privacy">NSView</string>
+ <string key="view_profile">NSView</string>
+ <string key="view_setup">NSView</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="checkBox_checkMail">
+ <string key="name">checkBox_checkMail</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_sendTyping">
+ <string key="name">checkBox_sendTyping</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_alias">
+ <string key="name">label_alias</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_encryption">
+ <string key="name">label_encryption</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_password">
+ <string key="name">label_password</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_port">
+ <string key="name">label_port</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_server">
+ <string key="name">label_server</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_typing">
+ <string key="name">label_typing</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="popUp_encryption">
+ <string key="name">popUp_encryption</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="progressIndicator_registering">
+ <string key="name">progressIndicator_registering</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_accountUID">
+ <string key="name">textField_accountUID</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_accountUIDLabel">
+ <string key="name">textField_accountUIDLabel</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_alias">
+ <string key="name">textField_alias</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_connectHost">
+ <string key="name">textField_connectHost</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_connectPort">
+ <string key="name">textField_connectPort</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_password">
+ <string key="name">textField_password</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_registering">
+ <string key="name">textField_registering</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_auxiliaryTabView">
+ <string key="name">view_auxiliaryTabView</string>
+ <string key="candidateClassName">NSTabView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_options">
+ <string key="name">view_options</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_privacy">
+ <string key="name">view_privacy</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_profile">
+ <string key="name">view_profile</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_setup">
+ <string key="name">view_setup</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Frameworks/Adium Framework/Source/AIAccountViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIAccountViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <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="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Frameworks/Adium Framework/Source/AIAccountViewController.m</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationButton</string>
+ <string key="superclassName">NSButton</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Frameworks/Adium Framework/Source/AILocalizationButton.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AILocalizationTextField</string>
+ <string key="superclassName">NSTextField</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="view_anchorToLeftSide">NSView</string>
+ <string key="view_anchorToRightSide">NSView</string>
+ <string key="window_anchorOnLeftSide">NSWindow</string>
+ <string key="window_anchorOnRightSide">NSWindow</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="view_anchorToLeftSide">
+ <string key="name">view_anchorToLeftSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="view_anchorToRightSide">
+ <string key="name">view_anchorToRightSide</string>
+ <string key="candidateClassName">NSView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnLeftSide">
+ <string key="name">window_anchorOnLeftSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_anchorOnRightSide">
+ <string key="name">window_anchorOnRightSide</string>
+ <string key="candidateClassName">NSWindow</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Frameworks/Adium Framework/Source/AILocalizationTextField.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIPurpleGTalkAccountViewController</string>
+ <string key="superclassName">ESPurpleJabberAccountViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">requestAccess:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">requestAccess:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">requestAccess:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="label_code">NSTextField</string>
+ <string key="label_grant">NSTextField</string>
+ <string key="textField_code">NSTextField</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="label_code">
+ <string key="name">label_code</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_grant">
+ <string key="name">label_grant</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_code">
+ <string key="name">textField_code</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Plugins/Purple Service/AIPurpleGTalkAccountViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">AIPurpleGTalkAccountViewController</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">requestAccess:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">requestAccess:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">requestAccess:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Plugins/Purple Service/AIPurpleGTalkAccountViewController.m</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">ESPurpleJabberAccountViewController</string>
+ <string key="superclassName">PurpleAccountViewController</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="registerCancel:">id</string>
+ <string key="registerNewAccount:">id</string>
+ <string key="registerRequestAccount:">id</string>
+ <string key="subscriptionModeDidChange:">id</string>
+ <string key="visitServerHomepage:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="registerCancel:">
+ <string key="name">registerCancel:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="registerNewAccount:">
+ <string key="name">registerNewAccount:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="registerRequestAccount:">
+ <string key="name">registerRequestAccount:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="subscriptionModeDidChange:">
+ <string key="name">subscriptionModeDidChange:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="visitServerHomepage:">
+ <string key="name">visitServerHomepage:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="button_register">NSButton</string>
+ <string key="button_serverHomepage">NSButton</string>
+ <string key="checkBox_allowPlaintext">NSButton</string>
+ <string key="checkBox_checkCertificates">NSButton</string>
+ <string key="checkBox_forceOldSSL">NSButton</string>
+ <string key="checkBox_requireTLS">NSButton</string>
+ <string key="checkBox_useTLS">NSButton</string>
+ <string key="comboBox_subscriptionGroup">NSComboBox</string>
+ <string key="popup_subscriptionBehavior">NSPopUpButton</string>
+ <string key="tableview_servers">NSTableView</string>
+ <string key="textField_BOSHserver">NSTextField</string>
+ <string key="textField_connectServer">NSTextField</string>
+ <string key="textField_ftProxies">NSTextField</string>
+ <string key="textField_priorityAvailable">NSTextField</string>
+ <string key="textField_priorityAway">NSTextField</string>
+ <string key="textField_registerServerName">NSTextField</string>
+ <string key="textField_registerServerPort">NSTextField</string>
+ <string key="textField_resource">NSTextField</string>
+ <string key="textField_subscriptionModeLabel">NSTextField</string>
+ <string key="textView_serverDescription">NSTextView</string>
+ <string key="window_registerServer">NSPanel</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="button_register">
+ <string key="name">button_register</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="button_serverHomepage">
+ <string key="name">button_serverHomepage</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_allowPlaintext">
+ <string key="name">checkBox_allowPlaintext</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_checkCertificates">
+ <string key="name">checkBox_checkCertificates</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_forceOldSSL">
+ <string key="name">checkBox_forceOldSSL</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_requireTLS">
+ <string key="name">checkBox_requireTLS</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_useTLS">
+ <string key="name">checkBox_useTLS</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="comboBox_subscriptionGroup">
+ <string key="name">comboBox_subscriptionGroup</string>
+ <string key="candidateClassName">NSComboBox</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="popup_subscriptionBehavior">
+ <string key="name">popup_subscriptionBehavior</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tableview_servers">
+ <string key="name">tableview_servers</string>
+ <string key="candidateClassName">NSTableView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_BOSHserver">
+ <string key="name">textField_BOSHserver</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_connectServer">
+ <string key="name">textField_connectServer</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_ftProxies">
+ <string key="name">textField_ftProxies</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_priorityAvailable">
+ <string key="name">textField_priorityAvailable</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_priorityAway">
+ <string key="name">textField_priorityAway</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_registerServerName">
+ <string key="name">textField_registerServerName</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_registerServerPort">
+ <string key="name">textField_registerServerPort</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_resource">
+ <string key="name">textField_resource</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_subscriptionModeLabel">
+ <string key="name">textField_subscriptionModeLabel</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textView_serverDescription">
+ <string key="name">textView_serverDescription</string>
+ <string key="candidateClassName">NSTextView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="window_registerServer">
+ <string key="name">window_registerServer</string>
+ <string key="candidateClassName">NSPanel</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Plugins/Purple Service/ESPurpleJabberAccountViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">ESPurpleJabberAccountViewController</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="registerCancel:">id</string>
+ <string key="registerNewAccount:">id</string>
+ <string key="registerRequestAccount:">id</string>
+ <string key="subscriptionModeDidChange:">id</string>
+ <string key="visitServerHomepage:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="registerCancel:">
+ <string key="name">registerCancel:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="registerNewAccount:">
+ <string key="name">registerNewAccount:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="registerRequestAccount:">
+ <string key="name">registerRequestAccount:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="subscriptionModeDidChange:">
+ <string key="name">subscriptionModeDidChange:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="visitServerHomepage:">
+ <string key="name">visitServerHomepage:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Plugins/Purple Service/ESPurpleJabberAccountViewController.m</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">selectServiceType:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">selectServiceType:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">selectServiceType:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Source/AIServiceMenu.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">PurpleAccountViewController</string>
+ <string key="superclassName">AIAccountViewController</string>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="checkBox_broadcastMusic">NSButton</string>
+ <string key="checkBox_displayCustomEmoticons">NSButton</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="checkBox_broadcastMusic">
+ <string key="name">checkBox_broadcastMusic</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_displayCustomEmoticons">
+ <string key="name">checkBox_displayCustomEmoticons</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Plugins/Purple Service/PurpleAccountViewController.h</string>
+ </object>
+ </object>
+ </array>
+ <array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+ <object class="IBPartialClassDescription">
+ <string key="className">AIAccountViewController</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <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>
+ <dictionary class="NSMutableDictionary" key="outlets">
+ <string key="checkBox_checkMail">NSButton</string>
+ <string key="checkBox_sendTyping">NSButton</string>
+ <string key="label_alias">NSTextField</string>
+ <string key="label_encryption">NSTextField</string>
+ <string key="label_password">NSTextField</string>
+ <string key="label_port">NSTextField</string>
+ <string key="label_server">NSTextField</string>
+ <string key="label_typing">NSTextField</string>
+ <string key="popUp_encryption">NSPopUpButton</string>
+ <string key="progressIndicator_registering">NSProgressIndicator</string>
+ <string key="textField_accountUID">NSTextField</string>
+ <string key="textField_accountUIDLabel">NSTextField</string>
+ <string key="textField_alias">NSTextField</string>
+ <string key="textField_connectHost">NSTextField</string>
+ <string key="textField_connectPort">NSTextField</string>
+ <string key="textField_password">NSTextField</string>
+ <string key="textField_registering">NSTextField</string>
+ <string key="view_auxiliaryTabView">NSTabView</string>
+ <string key="view_options">NSView</string>
+ <string key="view_privacy">NSView</string>
+ <string key="view_profile">NSView</string>
+ <string key="view_setup">NSView</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="checkBox_checkMail">
+ <string key="name">checkBox_checkMail</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_sendTyping">
+ <string key="name">checkBox_sendTyping</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_alias">
+ <string key="name">label_alias</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_encryption">
+ <string key="name">label_encryption</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_password">
+ <string key="name">label_password</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_port">
+ <string key="name">label_port</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_server">
+ <string key="name">label_server</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="label_typing">
+ <string key="name">label_typing</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="popUp_encryption">
+ <string key="name">popUp_encryption</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
More information about the commits
mailing list