adium-1.4 3432:b16a295429b2: Don't allow a Facebook account to u...
commits at adium.im
commits at adium.im
Sat Mar 19 00:57:38 UTC 2011
details: http://hg.adium.im/adium-1.4/rev/b16a295429b2
revision: 3432:b16a295429b2
branch: facebook-xmpp
author: Frank Dowsett <wixardy at adium.im>
date: Fri Mar 18 20:00:11 2011 -0400
Don't allow a Facebook account to unregister itself with the server.
Subject: adium-1.4 3433:38bb3e2f5251: Similarly to 07a3fd67571f don't forget the account's password if there isn't a textfield for it.
details: http://hg.adium.im/adium-1.4/rev/38bb3e2f5251
revision: 3433:38bb3e2f5251
branch: facebook-xmpp
author: Frank Dowsett <wixardy at adium.im>
date: Fri Mar 18 20:01:14 2011 -0400
Similarly to 07a3fd67571f don't forget the account's password if there isn't a textfield for it.
Subject: adium-1.4 3434:6ffc02f14020: Migrate pidgin-facebook accounts to xmpp accounts fixes #13999. The account will start its migration on connect or when the account is being edited (I might be misusing the AIEditAccount notification for that). Users with more than one Facebook account will only get one auto-migrated.
details: http://hg.adium.im/adium-1.4/rev/6ffc02f14020
revision: 3434:6ffc02f14020
branch: facebook-xmpp
author: Frank Dowsett <wixardy at adium.im>
date: Fri Mar 18 20:46:09 2011 -0400
Migrate pidgin-facebook accounts to xmpp accounts fixes #13999. The account will start its migration on connect or when the account is being edited (I might be misusing the AIEditAccount notification for that). Users with more than one Facebook account will only get one auto-migrated.
Also move the old account's transcripts to the new account's location changing the names along the way.
diffs (truncated from 2109 to 1000 lines):
diff -r 07a3fd67571f -r 6ffc02f14020 Frameworks/Adium Framework/Source/AIAccountViewController.m
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m Wed Mar 16 21:57:14 2011 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m Fri Mar 18 20:46:09 2011 -0400
@@ -288,7 +288,7 @@
if (![password isEqualToString:oldPassword]) {
[adium.accountController setPassword:password forAccount:account];
}
- } else if (oldPassword && [oldPassword length] != 0) {
+ } else if ((oldPassword && [oldPassword length] != 0) && textField_password) {
[adium.accountController forgetPasswordForAccount:account];
}
diff -r 07a3fd67571f -r 6ffc02f14020 Plugins/Purple Service/AIFacebookXMPPAccount.h
--- a/Plugins/Purple Service/AIFacebookXMPPAccount.h Wed Mar 16 21:57:14 2011 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPAccount.h Fri Mar 18 20:46:09 2011 -0400
@@ -12,9 +12,11 @@
@interface AIFacebookXMPPAccount : CBPurpleAccount {
AIFacebookXMPPOAuthWebViewWindowController *oAuthWC;
+ AIAccount *migratingAccount;
}
@property (nonatomic, retain) AIFacebookXMPPOAuthWebViewWindowController *oAuthWC;
+ at property (nonatomic, assign) AIAccount *migratingAccount;
- (void)requestFacebookAuthorization;
- (void)oAuthWebViewController:(AIFacebookXMPPOAuthWebViewWindowController *)wc didSucceedWithToken:(NSString *)token;
@end
diff -r 07a3fd67571f -r 6ffc02f14020 Plugins/Purple Service/AIFacebookXMPPAccount.m
--- a/Plugins/Purple Service/AIFacebookXMPPAccount.m Wed Mar 16 21:57:14 2011 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPAccount.m Fri Mar 18 20:46:09 2011 -0400
@@ -21,10 +21,18 @@
#import <Adium/AIAccountControllerProtocol.h>
#import <Adium/AIPasswordPromptController.h>
+#import <Adium/AILoginControllerProtocol.h>
+#import <AIUtilities/AIStringAdditions.h>
+#import <Adium/AIService.h>
+
+ at interface AIFacebookXMPPAccount ()
+- (void)finishMigration;
+ at end
@implementation AIFacebookXMPPAccount
@synthesize oAuthWC;
+ at synthesize migratingAccount;
#pragma mark Connectivitiy
@@ -77,6 +85,11 @@
return NO;
}
+- (BOOL)allowAccountUnregistrationIfSupportedByLibpurple
+{
+ return NO;
+}
+
/*!
* @brief Password entered callback
*
@@ -222,6 +235,11 @@
{
self.oAuthWC = [[[AIFacebookXMPPOAuthWebViewWindowController alloc] init] autorelease];
self.oAuthWC.account = self;
+
+ if (self.migratingAccount) {
+ self.oAuthWC.autoFillUsername = self.migratingAccount.UID;
+ self.oAuthWC.autoFillPassword = [adium.accountController passwordForAccount:self.migratingAccount];
+ }
[self.oAuthWC showWindow:self];
}
@@ -262,6 +280,61 @@
/* When we're newly authorized, connect! */
[self connect];
+
+ if (self.migratingAccount)
+ [self finishMigration];
+}
+
+#pragma mark Migration
+/*
+ * Move logs from the old account's to the new account's log folder, changing the name along the way.
+ * Finally delete the old account.
+ */
+- (void)finishMigration
+{
+ if (!self.migratingAccount)
+ return;
+
+ //Move logs to the new account
+ NSString *logsDir = [[adium.loginController userDirectory] stringByAppendingPathComponent:@"/Logs"];
+
+ NSString *oldFolder = [NSString stringWithFormat:@"%@.%@", self.migratingAccount.service.serviceID, [self.migratingAccount.UID safeFilenameString]];
+ NSString *newFolder = [NSString stringWithFormat:@"%@.%@", self.service.serviceID, [self.UID safeFilenameString]];
+ NSString *basePath = [[logsDir stringByAppendingPathComponent:oldFolder] stringByExpandingTildeInPath];
+ NSString *newPath = [[logsDir stringByAppendingPathComponent:newFolder] stringByExpandingTildeInPath];
+
+ NSFileManager *fileManager = [[[NSFileManager alloc] init] autorelease];
+ NSInteger errors = 0;
+
+ for (NSString *file in [fileManager enumeratorAtPath:basePath]) {
+ if ([[file pathExtension] isEqualToString:@"xml"]) {
+ /* turn 'XXXXXXX69 (2009-01-20T19.10.07-0500).xml'
+ * into '-XXXXXXX69 at chat.facebook.com (2009-01-20T19.10.07-0500).xml'
+ */
+ NSRange UIDrange = [[file lastPathComponent] rangeOfString:@" "];
+ if (UIDrange.location > 0) {
+ NSString *uid = [[file lastPathComponent] substringToIndex:UIDrange.location];
+ NSString *newName = [file stringByReplacingOccurrencesOfString:uid
+ withString:[NSString stringWithFormat:@"-%@@%@", uid, self.host]];
+
+ [fileManager createDirectoryAtPath:[newPath stringByAppendingPathComponent:[newName stringByDeletingLastPathComponent]]
+ withIntermediateDirectories:YES
+ attributes:nil
+ error:NULL];
+ if (![fileManager moveItemAtPath:[basePath stringByAppendingPathComponent:file]
+ toPath:[newPath stringByAppendingPathComponent:newName]
+ error:NULL])
+ errors++;
+ }
+ }
+ }
+
+ if (!errors)
+ [fileManager removeItemAtPath:basePath error:NULL];
+
+ //Delete old account
+ [adium.accountController deleteAccount:self.migratingAccount];
+ self.migratingAccount = nil;
}
@end
diff -r 07a3fd67571f -r 6ffc02f14020 Plugins/Purple Service/AIFacebookXMPPAccountView.xib
--- a/Plugins/Purple Service/AIFacebookXMPPAccountView.xib Wed Mar 16 21:57:14 2011 -0500
+++ b/Plugins/Purple Service/AIFacebookXMPPAccountView.xib Fri Mar 18 20:46:09 2011 -0400
@@ -3,16 +3,22 @@
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10J567</string>
- <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.InterfaceBuilderVersion">1305</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">788</string>
+ <string key="NS.object.0">1305</string>
</object>
- <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="43"/>
+ <string>NSTextField</string>
+ <string>NSView</string>
+ <string>NSProgressIndicator</string>
+ <string>NSTextFieldCell</string>
+ <string>NSButtonCell</string>
+ <string>NSButton</string>
+ <string>NSCustomObject</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -23,9 +29,7 @@
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.values" ref="0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -48,6 +52,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{8, 164}, {378, 34}}</string>
<reference key="NSSuperview" ref="610496814"/>
+ <reference key="NSNextKeyView" ref="290214125"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="12458334">
<int key="NSCellFlags">67239424</int>
@@ -84,6 +89,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{8, 0}, {378, 117}}</string>
<reference key="NSSuperview" ref="610496814"/>
+ <reference key="NSNextKeyView" ref="901696267"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1047490784">
<int key="NSCellFlags">67239424</int>
@@ -100,12 +106,13 @@
<int key="NSvFlags">269</int>
<string key="NSFrame">{{118, 128}, {157, 32}}</string>
<reference key="NSSuperview" ref="610496814"/>
+ <reference key="NSNextKeyView" ref="444720455"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="119278707">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Allow Access</string>
- <object class="NSFont" key="NSSupport">
+ <object class="NSFont" key="NSSupport" id="25279989">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
@@ -125,6 +132,7 @@
<object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{189, 100}, {16, 16}}</string>
<reference key="NSSuperview" ref="610496814"/>
+ <reference key="NSNextKeyView"/>
<int key="NSpiFlags">20746</int>
<double key="NSMinValue">16</double>
<double key="NSMaxValue">100</double>
@@ -132,6 +140,103 @@
</object>
<string key="NSFrameSize">{394, 201}</string>
<reference key="NSSuperview"/>
+ <reference key="NSNextKeyView" ref="511623407"/>
+ </object>
+ <object class="NSView" id="1063351425">
+ <reference key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <object class="NSMutableArray" key="NSSubviews">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSTextField" id="989334992">
+ <reference key="NSNextResponder" ref="1063351425"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{8, 147}, {378, 51}}</string>
+ <reference key="NSSuperview" ref="1063351425"/>
+ <reference key="NSNextKeyView" ref="439253191"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="334008518">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">272891904</int>
+ <string key="NSContents">Your Facebook account is not set up to connect using the official and recommended way. In order to change this you will need to allow Adium access to your Facebook account.</string>
+ <reference key="NSSupport" ref="568567493"/>
+ <reference key="NSControlView" ref="989334992"/>
+ <reference key="NSBackgroundColor" ref="43977286"/>
+ <reference key="NSTextColor" ref="240581497"/>
+ </object>
+ </object>
+ <object class="NSTextField" id="969197541">
+ <reference key="NSNextResponder" ref="1063351425"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{8, -30}, {378, 117}}</string>
+ <reference key="NSSuperview" ref="1063351425"/>
+ <reference key="NSNextKeyView" ref="946119758"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSTextFieldCell" key="NSCell" id="363377028">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">272891904</int>
+ <string key="NSContents">Current status information will go here.</string>
+ <reference key="NSSupport" ref="568567493"/>
+ <reference key="NSControlView" ref="969197541"/>
+ <reference key="NSBackgroundColor" ref="43977286"/>
+ <reference key="NSTextColor" ref="240581497"/>
+ </object>
+ </object>
+ <object class="NSButton" id="663042750">
+ <reference key="NSNextResponder" ref="1063351425"/>
+ <int key="NSvFlags">269</int>
+ <string key="NSFrame">{{223, 99}, {157, 32}}</string>
+ <reference key="NSSuperview" ref="1063351425"/>
+ <reference key="NSNextKeyView" ref="969197541"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="773075235">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Allow Access</string>
+ <reference key="NSSupport" ref="25279989"/>
+ <reference key="NSControlView" ref="663042750"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSProgressIndicator" id="946119758">
+ <reference key="NSNextResponder" ref="1063351425"/>
+ <int key="NSvFlags">-2147482356</int>
+ <object class="NSPSMatrix" key="NSDrawMatrix"/>
+ <string key="NSFrame">{{189, 71}, {16, 16}}</string>
+ <reference key="NSSuperview" ref="1063351425"/>
+ <int key="NSpiFlags">20746</int>
+ <double key="NSMinValue">16</double>
+ <double key="NSMaxValue">100</double>
+ </object>
+ <object class="NSButton" id="439253191">
+ <reference key="NSNextResponder" ref="1063351425"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{14, 99}, {150, 32}}</string>
+ <reference key="NSSuperview" ref="1063351425"/>
+ <reference key="NSNextKeyView" ref="663042750"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="1064574215">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">More Information</string>
+ <reference key="NSSupport" ref="25279989"/>
+ <reference key="NSControlView" ref="439253191"/>
+ <int key="NSButtonFlags">-2038284033</int>
+ <int key="NSButtonFlags2">129</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ </object>
+ <string key="NSFrameSize">{394, 201}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSNextKeyView" ref="989334992"/>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -177,6 +282,70 @@
</object>
<int key="connectionID">55</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">view_migration</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="1063351425"/>
+ </object>
+ <int key="connectionID">87</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">textField_migratioStatus</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="969197541"/>
+ </object>
+ <int key="connectionID">88</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">textField_migrationStatus</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="969197541"/>
+ </object>
+ <int key="connectionID">89</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">changedPreference:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="439253191"/>
+ </object>
+ <int key="connectionID">90</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">changedPreference:</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="663042750"/>
+ </object>
+ <int key="connectionID">91</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_migrationHelp</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="439253191"/>
+ </object>
+ <int key="connectionID">92</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">button_migrationOAuthStart</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="663042750"/>
+ </object>
+ <int key="connectionID">93</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">migrationSpinner</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="946119758"/>
+ </object>
+ <int key="connectionID">94</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -265,12 +434,90 @@
<reference key="object" ref="12458334"/>
<reference key="parent" ref="511623407"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">77</int>
+ <reference key="object" ref="1063351425"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="946119758"/>
+ <reference ref="969197541"/>
+ <reference ref="989334992"/>
+ <reference ref="663042750"/>
+ <reference ref="439253191"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Migration</string>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">78</int>
+ <reference key="object" ref="946119758"/>
+ <reference key="parent" ref="1063351425"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">79</int>
+ <reference key="object" ref="969197541"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="363377028"/>
+ </object>
+ <reference key="parent" ref="1063351425"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">80</int>
+ <reference key="object" ref="989334992"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="334008518"/>
+ </object>
+ <reference key="parent" ref="1063351425"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">81</int>
+ <reference key="object" ref="663042750"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="773075235"/>
+ </object>
+ <reference key="parent" ref="1063351425"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">82</int>
+ <reference key="object" ref="439253191"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="1064574215"/>
+ </object>
+ <reference key="parent" ref="1063351425"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">83</int>
+ <reference key="object" ref="1064574215"/>
+ <reference key="parent" ref="439253191"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">84</int>
+ <reference key="object" ref="773075235"/>
+ <reference key="parent" ref="663042750"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">85</int>
+ <reference key="object" ref="334008518"/>
+ <reference key="parent" ref="989334992"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">86</int>
+ <reference key="object" ref="363377028"/>
+ <reference key="parent" ref="969197541"/>
+ </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>43.IBEditorWindowLastContentRect</string>
<string>43.IBPluginDependency</string>
<string>43.ImportedFromIB2</string>
@@ -285,9 +532,28 @@
<string>48.IBPluginDependency</string>
<string>49.IBPluginDependency</string>
<string>50.IBPluginDependency</string>
+ <string>77.IBEditorWindowLastContentRect</string>
+ <string>77.IBPluginDependency</string>
+ <string>77.ImportedFromIB2</string>
+ <string>78.IBPluginDependency</string>
+ <string>78.ImportedFromIB2</string>
+ <string>79.IBPluginDependency</string>
+ <string>79.ImportedFromIB2</string>
+ <string>80.IBPluginDependency</string>
+ <string>80.ImportedFromIB2</string>
+ <string>81.IBPluginDependency</string>
+ <string>81.ImportedFromIB2</string>
+ <string>82.IBPluginDependency</string>
+ <string>83.IBPluginDependency</string>
+ <string>84.IBPluginDependency</string>
+ <string>85.IBPluginDependency</string>
+ <string>86.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>
<string>{{663, 648}, {394, 201}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
@@ -302,1372 +568,39 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>{{663, 648}, {394, 201}}</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>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>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- </object>
+ <reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">55</int>
+ <int key="maxID">94</int>
</object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <object class="NSMutableArray" key="referencedPartialClassDescriptions">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <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>
- <object class="NSMutableDictionary" key="outlets">
- <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>
- <string>NSButton</string>
- <string>NSButton</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSPopUpButton</string>
- <string>NSProgressIndicator</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTextField</string>
- <string>NSTabView</string>
- <string>NSView</string>
- <string>NSView</string>
- <string>NSView</string>
- <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">Frameworks/Adium Framework/Source/AIAccountViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">AIFacebookXMPPAccountViewController</string>
- <string key="superclassName">AIAccountViewController</string>
- <object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>button_OAuthStart</string>
- <string>spinner</string>
- <string>textField_OAuthStatus</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSButton</string>
- <string>NSProgressIndicator</string>
- <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>button_OAuthStart</string>
- <string>spinner</string>
- <string>textField_OAuthStatus</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="IBToOneOutletInfo">
- <string key="name">button_OAuthStart</string>
- <string key="candidateClassName">NSButton</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">spinner</string>
- <string key="candidateClassName">NSProgressIndicator</string>
- </object>
- <object class="IBToOneOutletInfo">
- <string key="name">textField_OAuthStatus</string>
- <string key="candidateClassName">NSTextField</string>
- </object>
- </object>
- </object>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Plugins/Purple Service/AIFacebookXMPPAccountViewController.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>
- <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">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="129956166">
- <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">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Frameworks/AIUtilities Framework/Source/AIMenuAdditions.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/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="129956166"/>
- </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="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">toggleFindPanel:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">toggleFindPanel:</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/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="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">adiumPrint:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">adiumPrint:</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/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="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">prefsWindowWillClose:</string>
- <object class="IBActionInfo" key="NS.object.0">
- <string key="name">prefsWindowWillClose:</string>
- <string key="candidateClassName">SS_PrefsController</string>
- </object>
More information about the commits
mailing list