adium 3375:70ef78e3ad86: Removed the Twitter 'show retweet link'...
commits at adium.im
commits at adium.im
Mon Oct 18 06:15:39 UTC 2010
details: http://hg.adium.im/adium/rev/70ef78e3ad86
revision: 3375:70ef78e3ad86
author: Evan Schoenberg
date: Mon Oct 18 01:14:48 2010 -0500
Removed the Twitter 'show retweet link' preference - it is always on, as retweeting is a common and accepted Twitter practice now. Refs #12761
(transplanted from 59f9776474c59c609e4dacf896c50b66db32c83c)
diffs (truncated from 23506 to 1000 lines):
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/AITwitterAccount.h
--- a/Plugins/Twitter Plugin/AITwitterAccount.h Mon Oct 18 00:54:37 2010 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccount.h Mon Oct 18 01:14:48 2010 -0500
@@ -99,7 +99,6 @@
#define TWITTER_PREFERENCE_UPDATE_AFTER_SEND @"Update After Send"
#define TWITTER_PREFERENCE_UPDATE_GLOBAL @"Update Global Status"
#define TWITTER_PREFERENCE_UPDATE_GLOBAL_REPLIES @"Update Global Status Includes Replies"
-#define TWITTER_PREFERENCE_RETWEET_SPAM @"Retweet Enabled"
#define TWITTER_PREFERENCE_LOAD_CONTACTS @"Load Follows as Contacts"
#define TWITTER_PREFERENCE_EVER_LOADED_TIMELINE @"Ever Loaded Timeline"
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Mon Oct 18 00:54:37 2010 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Mon Oct 18 01:14:48 2010 -0500
@@ -95,7 +95,6 @@
[adium.preferenceController registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:TWITTER_UPDATE_INTERVAL_MINUTES], TWITTER_PREFERENCE_UPDATE_INTERVAL,
[NSNumber numberWithBool:YES], TWITTER_PREFERENCE_UPDATE_AFTER_SEND,
- [NSNumber numberWithBool:YES], TWITTER_PREFERENCE_RETWEET_SPAM,
[NSNumber numberWithBool:YES], TWITTER_PREFERENCE_LOAD_CONTACTS, nil]
forGroup:TWITTER_PREFERENCE_GROUP_UPDATES
object:self];
@@ -1452,39 +1451,44 @@
if(![self.UID isCaseInsensitivelyEqualToString:userID]) {
// A message from someone other than ourselves. RT and @ is permissible.
- if (retweetLink) {
- if(commaNeeded) {
- [mutableMessage appendString:@", " withAttributes:nil];
- }
-
- linkAddress = [self addressForLinkType:AITwitterLinkRetweet
- userID:userID
- statusID:tweetID
- context:nil];
-
- // If the account doesn't support retweets, it returns nil.
- if (linkAddress) {
- [mutableMessage appendAttributedString:[self attributedStringWithLinkLabel:@"RT"
- linkDestination:linkAddress
- linkClass:AITwitterRetweetClassName]];
-
- [mutableMessage appendString:@", " withAttributes:nil];
- }
-
- linkAddress = [self addressForLinkType:AITwitterLinkQuote
- userID:userID
- statusID:tweetID
- context:[inMessage stringByAddingPercentEscapesForAllCharacters]];
-
-#define PILCROW_SIGN @"\u00B6"
-
- [mutableMessage appendAttributedString:[self attributedStringWithLinkLabel:PILCROW_SIGN
+
+ /* Add the retweet link, if the account supports retweets */
+ if(commaNeeded) {
+ [mutableMessage appendString:@", " withAttributes:nil];
+ }
+
+ linkAddress = [self addressForLinkType:AITwitterLinkRetweet
+ userID:userID
+ statusID:tweetID
+ context:nil];
+
+ // If the account doesn't support retweets, it returns nil.
+ if (linkAddress) {
+ [mutableMessage appendAttributedString:[self attributedStringWithLinkLabel:@"RT"
linkDestination:linkAddress
- linkClass:AITwitterQuoteClassName]];
-
+ linkClass:AITwitterRetweetClassName]];
commaNeeded = YES;
}
+
+ /* Next add the quote link */
+ if(commaNeeded) {
+ [mutableMessage appendString:@", " withAttributes:nil];
+ }
+ linkAddress = [self addressForLinkType:AITwitterLinkQuote
+ userID:userID
+ statusID:tweetID
+ context:[inMessage stringByAddingPercentEscapesForAllCharacters]];
+
+#define PILCROW_SIGN @"\u00B6"
+
+ [mutableMessage appendAttributedString:[self attributedStringWithLinkLabel:PILCROW_SIGN
+ linkDestination:linkAddress
+ linkClass:AITwitterQuoteClassName]];
+
+ commaNeeded = YES;
+
+ /* Now add the reply link */
if (commaNeeded) {
[mutableMessage appendString:@", " withAttributes:nil];
}
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/AITwitterAccountViewController.h
--- a/Plugins/Twitter Plugin/AITwitterAccountViewController.h Mon Oct 18 00:54:37 2010 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccountViewController.h Mon Oct 18 01:14:48 2010 -0500
@@ -33,7 +33,6 @@
IBOutlet NSTextField *textField_APIpath;
IBOutlet NSButton *checkBox_useSSL;
- IBOutlet NSButton *checkBox_retweet;
IBOutlet NSButton *checkBox_loadContacts;
IBOutlet NSPopUpButton *popUp_updateInterval;
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/classes.nib
--- a/Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/classes.nib Mon Oct 18 00:54:37 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBClasses</key>
- <array>
- <dict>
- <key>CLASS</key>
- <string>NSApplication</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>delegate</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>RBSplitSubview</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>RBSplitSubview</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSView</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSMenu</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>adiumPrint</key>
- <string>id</string>
- <key>didAdjustSubviews</key>
- <string>RBSplitView</string>
- <key>prefsWindowWillClose</key>
- <string>SS_PrefsController</string>
- <key>toggleFindPanel</key>
- <string>id</string>
- <key>willAdjustSubviews</key>
- <string>RBSplitView</string>
- </dict>
- <key>CLASS</key>
- <string>NSObject</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSWindow</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AITwitterAccountViewController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>button_OAuthStart</key>
- <string>NSButton</string>
- <key>checkBox_loadContacts</key>
- <string>NSButton</string>
- <key>checkBox_retweet</key>
- <string>NSButton</string>
- <key>checkBox_updateAfterSend</key>
- <string>NSButton</string>
- <key>checkBox_updateGlobalIncludeReplies</key>
- <string>NSButton</string>
- <key>checkBox_updateGlobalStatus</key>
- <string>NSButton</string>
- <key>popUp_updateInterval</key>
- <string>NSPopUpButton</string>
- <key>progressIndicator</key>
- <string>NSProgressIndicator</string>
- <key>tabViewItem_OAuth</key>
- <string>NSTabViewItem</string>
- <key>tabViewItem_basicAuthentication</key>
- <string>NSTabViewItem</string>
- <key>tabView_authenticationType</key>
- <string>NSTabView</string>
- <key>textField_APIpath</key>
- <string>NSTextField</string>
- <key>textField_OAuthDescription</key>
- <string>NSTextField</string>
- <key>textField_OAuthStatus</key>
- <string>NSTextField</string>
- <key>textField_OAuthVerifier</key>
- <string>NSTextField</string>
- <key>textField_description</key>
- <string>NSTextField</string>
- <key>textField_email</key>
- <string>NSTextField</string>
- <key>textField_location</key>
- <string>NSTextField</string>
- <key>textField_name</key>
- <string>NSTextField</string>
- <key>textField_server</key>
- <string>NSTextField</string>
- <key>textField_url</key>
- <string>NSTextField</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>AIAccountViewController</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSResponder</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSMenuItem</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>FirstResponder</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSCell</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSButton</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSControl</string>
- </dict>
- <dict>
- <key>ACTIONS</key>
- <dict>
- <key>changedPreference</key>
- <string>id</string>
- </dict>
- <key>CLASS</key>
- <string>AIAccountViewController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>checkBox_checkMail</key>
- <string>NSButton</string>
- <key>checkBox_sendTyping</key>
- <string>NSButton</string>
- <key>label_alias</key>
- <string>NSTextField</string>
- <key>label_encryption</key>
- <string>NSTextField</string>
- <key>label_password</key>
- <string>NSTextField</string>
- <key>label_port</key>
- <string>NSTextField</string>
- <key>label_server</key>
- <string>NSTextField</string>
- <key>label_typing</key>
- <string>NSTextField</string>
- <key>popUp_encryption</key>
- <string>NSPopUpButton</string>
- <key>progressIndicator_registering</key>
- <string>NSProgressIndicator</string>
- <key>textField_accountUID</key>
- <string>NSTextField</string>
- <key>textField_accountUIDLabel</key>
- <string>NSTextField</string>
- <key>textField_alias</key>
- <string>NSTextField</string>
- <key>textField_connectHost</key>
- <string>NSTextField</string>
- <key>textField_connectPort</key>
- <string>NSTextField</string>
- <key>textField_password</key>
- <string>NSTextField</string>
- <key>textField_registering</key>
- <string>NSTextField</string>
- <key>view_auxiliaryTabView</key>
- <string>NSTabView</string>
- <key>view_options</key>
- <string>NSView</string>
- <key>view_privacy</key>
- <string>NSView</string>
- <key>view_profile</key>
- <string>NSView</string>
- <key>view_setup</key>
- <string>NSView</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSPopUpButton</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSButton</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSTabView</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSView</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSPopUpButtonCell</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSMenuItemCell</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>AILocalizationTextField</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>view_anchorToLeftSide</key>
- <string>NSView</string>
- <key>view_anchorToRightSide</key>
- <string>NSView</string>
- <key>window_anchorOnLeftSide</key>
- <string>NSWindow</string>
- <key>window_anchorOnRightSide</key>
- <string>NSWindow</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSTextField</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>NSButtonCell</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>SUPERCLASS</key>
- <string>NSActionCell</string>
- </dict>
- <dict>
- <key>CLASS</key>
- <string>SS_PrefsController</string>
- <key>LANGUAGE</key>
- <string>ObjC</string>
- <key>OUTLETS</key>
- <dict>
- <key>delegate</key>
- <string>id</string>
- </dict>
- <key>SUPERCLASS</key>
- <string>NSObject</string>
- </dict>
- </array>
- <key>IBVersion</key>
- <string>1</string>
-</dict>
-</plist>
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/designable.nib
--- a/Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/designable.nib Mon Oct 18 00:54:37 2010 -0500
+++ b/Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/designable.nib Mon Oct 18 01:14:48 2010 -0500
@@ -2,22 +2,24 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10B504</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.2</string>
- <string key="IBDocument.HIToolboxVersion">437.00</string>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">804</string>
</object>
<array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<integer value="281"/>
- <integer value="445"/>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
- <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+ <object class="NSMutableDictionary" key="IBDocument.Metadata">
+ <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+ <integer value="1" key="NS.object.0"/>
+ </object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="75982325">
<object class="NSCustomObject" id="577370903">
<string key="NSClassName">AITwitterAccountViewController</string>
@@ -358,32 +360,10 @@
<reference key="NSTextColor" ref="1040924361"/>
</object>
</object>
- <object class="NSButton" id="572355244">
- <reference key="NSNextResponder" ref="928353753"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{140, 31}, {225, 18}}</string>
- <reference key="NSSuperview" ref="928353753"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="776710747">
- <int key="NSCellFlags">-2080244224</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Show "Retweet" link after tweets</string>
- <reference key="NSSupport" ref="102052516"/>
- <reference key="NSControlView" ref="572355244"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">130</int>
- <reference key="NSNormalImage" ref="874485579"/>
- <reference key="NSAlternateImage" ref="63880930"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
- </object>
<object class="NSButton" id="377578690">
<reference key="NSNextResponder" ref="928353753"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{140, 6}, {266, 18}}</string>
+ <string key="NSFrame">{{140, 31}, {266, 18}}</string>
<reference key="NSSuperview" ref="928353753"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="17114962">
@@ -551,7 +531,7 @@
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="375767636">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTabView" id="183466937">
@@ -748,7 +728,6 @@
</object>
</array>
<string key="NSFrameSize">{375, 214}</string>
- <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
</array>
@@ -1014,22 +993,6 @@
<object class="IBActionConnection" key="connection">
<string key="label">changedPreference:</string>
<reference key="source" ref="577370903"/>
- <reference key="destination" ref="572355244"/>
- </object>
- <int key="connectionID">553</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">checkBox_retweet</string>
- <reference key="source" ref="577370903"/>
- <reference key="destination" ref="572355244"/>
- </object>
- <int key="connectionID">554</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">changedPreference:</string>
- <reference key="source" ref="577370903"/>
<reference key="destination" ref="377578690"/>
</object>
<int key="connectionID">585</int>
@@ -1101,8 +1064,6 @@
<reference ref="56151798"/>
<reference ref="640789319"/>
<reference ref="273876235"/>
- <reference ref="377578690"/>
- <reference ref="572355244"/>
<reference ref="101049228"/>
<reference ref="120473249"/>
<reference ref="278799254"/>
@@ -1112,6 +1073,7 @@
<reference ref="491413815"/>
<reference ref="299750509"/>
<reference ref="305057378"/>
+ <reference ref="377578690"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">Options</string>
@@ -1205,14 +1167,6 @@
<reference key="parent" ref="928353753"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">551</int>
- <reference key="object" ref="572355244"/>
- <array class="NSMutableArray" key="children">
- <reference ref="776710747"/>
- </array>
- <reference key="parent" ref="928353753"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">583</int>
<reference key="object" ref="377578690"/>
<array class="NSMutableArray" key="children">
@@ -1485,11 +1439,6 @@
<reference key="parent" ref="59881669"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">637</int>
- <reference key="object" ref="776710747"/>
- <reference key="parent" ref="572355244"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">638</int>
<reference key="object" ref="17114962"/>
<reference key="parent" ref="377578690"/>
@@ -1714,9 +1663,10 @@
<boolean value="YES" key="518.ImportedFromIB2"/>
<string key="549.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="549.ImportedFromIB2"/>
- <string key="551.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <boolean value="YES" key="551.ImportedFromIB2"/>
<string key="583.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <object class="NSAffineTransform" key="583.IBViewBoundsToFrameTransform">
+ <bytes key="NSTransformStruct">P4AAAL+AAABDDAAAwbAAAA</bytes>
+ </object>
<boolean value="YES" key="583.ImportedFromIB2"/>
<string key="617.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="617.ImportedFromIB2"/>
@@ -1731,7 +1681,6 @@
<string key="634.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="635.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="636.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="637.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="638.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="639.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="640.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1771,6 +1720,13 @@
<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>
@@ -1795,6 +1751,96 @@
<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>
@@ -1817,6 +1863,24 @@
<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" id="623252843">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/AILocalizationTextField.h</string>
@@ -1836,10 +1900,10 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="button_OAuthStart">NSButton</string>
<string key="checkBox_loadContacts">NSButton</string>
- <string key="checkBox_retweet">NSButton</string>
<string key="checkBox_updateAfterSend">NSButton</string>
<string key="checkBox_updateGlobalIncludeReplies">NSButton</string>
<string key="checkBox_updateGlobalStatus">NSButton</string>
+ <string key="checkBox_useSSL">NSButton</string>
<string key="popUp_updateInterval">NSPopUpButton</string>
<string key="progressIndicator">NSProgressIndicator</string>
<string key="tabViewItem_OAuth">NSTabViewItem</string>
@@ -1853,6 +1917,80 @@
<string key="textField_name">NSTextField</string>
<string key="textField_url">NSTextField</string>
</dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="button_OAuthStart">
+ <string key="name">button_OAuthStart</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_loadContacts">
+ <string key="name">checkBox_loadContacts</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_updateAfterSend">
+ <string key="name">checkBox_updateAfterSend</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_updateGlobalIncludeReplies">
+ <string key="name">checkBox_updateGlobalIncludeReplies</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_updateGlobalStatus">
+ <string key="name">checkBox_updateGlobalStatus</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="checkBox_useSSL">
+ <string key="name">checkBox_useSSL</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="popUp_updateInterval">
+ <string key="name">popUp_updateInterval</string>
+ <string key="candidateClassName">NSPopUpButton</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="progressIndicator">
+ <string key="name">progressIndicator</string>
+ <string key="candidateClassName">NSProgressIndicator</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tabViewItem_OAuth">
+ <string key="name">tabViewItem_OAuth</string>
+ <string key="candidateClassName">NSTabViewItem</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tabViewItem_basicAuthentication">
+ <string key="name">tabViewItem_basicAuthentication</string>
+ <string key="candidateClassName">NSTabViewItem</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="tabView_authenticationType">
+ <string key="name">tabView_authenticationType</string>
+ <string key="candidateClassName">NSTabView</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_APIpath">
+ <string key="name">textField_APIpath</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_OAuthStatus">
+ <string key="name">textField_OAuthStatus</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_OAuthVerifier">
+ <string key="name">textField_OAuthVerifier</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_description">
+ <string key="name">textField_description</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_location">
+ <string key="name">textField_location</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_name">
+ <string key="name">textField_name</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_url">
+ <string key="name">textField_url</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Plugins/Twitter Plugin/AITwitterAccountViewController.h</string>
@@ -1866,6 +2004,20 @@
<string key="textField_email">NSTextField</string>
<string key="textField_server">NSTextField</string>
</dictionary>
+ <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="textField_OAuthDescription">
+ <string key="name">textField_OAuthDescription</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_email">
+ <string key="name">textField_email</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="textField_server">
+ <string key="name">textField_server</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
@@ -2018,6 +2170,13 @@
<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>
@@ -2050,6 +2209,13 @@
<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>
@@ -2117,6 +2283,13 @@
<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>
+ </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="991232126">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/Adium Framework/Source/SS_PrefsController.h</string>
@@ -2128,6 +2301,16 @@
<string key="didAdjustSubviews:">RBSplitView</string>
<string key="willAdjustSubviews:">RBSplitView</string>
</dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="didAdjustSubviews:">
+ <string key="name">didAdjustSubviews:</string>
+ <string key="candidateClassName">RBSplitView</string>
+ </object>
+ <object class="IBActionInfo" key="willAdjustSubviews:">
+ <string key="name">willAdjustSubviews:</string>
+ <string key="candidateClassName">RBSplitView</string>
+ </object>
+ </dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="10529199">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Frameworks/RBSplitView/Source/RBSplitView.h</string>
@@ -2352,6 +2535,13 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<reference key="sourceIdentifier" ref="10529199"/>
</object>
<object class="IBPartialClassDescription">
@@ -2369,6 +2559,13 @@
<string key="NS.key.0">delegate</string>
<string key="NS.object.0">id</string>
</object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">delegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">delegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<reference key="sourceIdentifier" ref="991232126"/>
</object>
<object class="IBPartialClassDescription">
@@ -2758,7 +2955,7 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">Growl-WithInstaller.framework/Headers/GrowlApplicationBridge.h</string>
+ <string key="minorKey">Growl.framework/Headers/GrowlApplicationBridge.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -3126,6 +3323,7 @@
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
+ <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<integer value="1050" key="NS.object.0"/>
@@ -3137,5 +3335,10 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<string key="IBDocument.LastKnownRelativeProjectPath">../../../Adium.xcodeproj</string>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NSMenuCheckmark">{9, 8}</string>
+ <string key="NSMenuMixedState">{7, 2}</string>
+ <string key="NSSwitch">{15, 15}</string>
+ </dictionary>
</data>
</archive>
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/info.nib
--- a/Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/info.nib Mon Oct 18 00:54:37 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBFramework Version</key>
- <string>677</string>
- <key>IBLastKnownRelativeProjectPath</key>
- <string>../../../Adium.xcodeproj</string>
- <key>IBOldestOS</key>
- <integer>5</integer>
- <key>IBOpenObjects</key>
- <array>
- <integer>449</integer>
- <integer>281</integer>
- </array>
- <key>IBSystem Version</key>
- <string>9J61</string>
- <key>targetFramework</key>
- <string>IBCocoaFramework</string>
-</dict>
-</plist>
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/keyedobjects.nib
Binary file Plugins/Twitter Plugin/ca.lproj/AITwitterAccountView.nib/keyedobjects.nib has changed
diff -r ec636ee7427a -r 70ef78e3ad86 Plugins/Twitter Plugin/cs.lproj/AITwitterAccountView.nib/designable.nib
--- a/Plugins/Twitter Plugin/cs.lproj/AITwitterAccountView.nib/designable.nib Mon Oct 18 00:54:37 2010 -0500
+++ b/Plugins/Twitter Plugin/cs.lproj/AITwitterAccountView.nib/designable.nib Mon Oct 18 01:14:48 2010 -0500
@@ -2,19 +2,24 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10C540</string>
- <string key="IBDocument.InterfaceBuilderVersion">740</string>
- <string key="IBDocument.AppKitVersion">1038.25</string>
- <string key="IBDocument.HIToolboxVersion">458.00</string>
+ <string key="IBDocument.SystemVersion">10F569</string>
+ <string key="IBDocument.InterfaceBuilderVersion">804</string>
+ <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">740</string>
+ <string key="NS.object.0">804</string>
</object>
- <array class="NSMutableArray" key="IBDocument.EditedObjectIDs"/>
+ <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+ <integer value="281"/>
More information about the commits
mailing list