adium 5244:7c1690d547c7: Fix an error from f34e6e092b22 where we...
commits at adium.im
commits at adium.im
Sun Dec 30 21:26:57 UTC 2012
details: http://hg.adium.im/adium/rev/7c1690d547c7
revision: 5244:7c1690d547c7
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Dec 30 16:23:36 2012 -0500
Fix an error from f34e6e092b22 where we were asking for the list object from the content before the content was set.
Subject: adium 5245:01588e6d76a3: Remove some unused instance variables.
details: http://hg.adium.im/adium/rev/01588e6d76a3
revision: 5245:01588e6d76a3
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Dec 30 16:23:48 2012 -0500
Remove some unused instance variables.
Subject: adium 5246:f0070858ec43: Update some xib versioning info to silence warnings about availablity of settings e.g. full screen support.
details: http://hg.adium.im/adium/rev/f0070858ec43
revision: 5246:f0070858ec43
branch: (none)
author: Frank Dowsett <wixardy at adium.im>
date: Sun Dec 30 16:25:44 2012 -0500
Update some xib versioning info to silence warnings about availablity of settings e.g. full screen support.
diffs (902 lines):
diff -r 535c713ff1de -r f0070858ec43 Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.h
--- a/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.h Sun Dec 30 16:25:44 2012 -0500
@@ -24,7 +24,6 @@
NSRect windowFrame;
- BOOL docked;
BOOL inLeftMouseEvent;
BOOL moveable;
}
diff -r 535c713ff1de -r f0070858ec43 Frameworks/AIUtilities Framework/Source/AIDelayedTextField.h
--- a/Frameworks/AIUtilities Framework/Source/AIDelayedTextField.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIDelayedTextField.h Sun Dec 30 16:25:44 2012 -0500
@@ -21,7 +21,6 @@
* An <tt>AIDelayedTextField</tt> is identical to an NSTextField except, instead of sending its target an action only when enter is pressed or the field loses focus, it sends the action after a specified delay without changes. This allows an intermediate behavior between changing every time the text chagnes (via the textDidChange: notification) and changing only when editing is complete.
*/
@interface AIDelayedTextField : NSTextField {
- BOOL pendingAction;
float delayInterval;
}
diff -r 535c713ff1de -r f0070858ec43 Frameworks/AIUtilities Framework/Source/AISendingTextView.h
--- a/Frameworks/AIUtilities Framework/Source/AISendingTextView.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AISendingTextView.h Sun Dec 30 16:25:44 2012 -0500
@@ -26,7 +26,6 @@
@interface AISendingTextView : AITextViewWithPlaceholder {
NSMutableArray *returnArray;
- BOOL insertingText;
id target;
SEL selector;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/AIUtilities Framework/Source/AITextViewWithPlaceholder.h
--- a/Frameworks/AIUtilities Framework/Source/AITextViewWithPlaceholder.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AITextViewWithPlaceholder.h Sun Dec 30 16:25:44 2012 -0500
@@ -23,7 +23,6 @@
@interface AITextViewWithPlaceholder : NSTextView {
NSAttributedString *placeholder;
- BOOL placeholderHasOwnAttributes;
}
/*
diff -r 535c713ff1de -r f0070858ec43 Frameworks/AIUtilities Framework/Source/MVMenuButton.h
--- a/Frameworks/AIUtilities Framework/Source/MVMenuButton.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/AIUtilities Framework/Source/MVMenuButton.h Sun Dec 30 16:25:44 2012 -0500
@@ -23,7 +23,6 @@
*/
@interface MVMenuButton : NSButton <NSCopying> {
NSImage *bigImage;
- NSImage *smallImage;
NSToolbarItem *__weak toolbarItem;
NSBezierPath *arrowPath;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIAbstractListController.h
--- a/Frameworks/Adium Framework/Source/AIAbstractListController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIAbstractListController.h Sun Dec 30 16:25:44 2012 -0500
@@ -184,7 +184,6 @@
CGFloat backgroundOpacity;
- BOOL inDrag;
NSArray *dragItems;
BOOL configuredViewsAndTooltips;
@@ -194,8 +193,6 @@
BOOL showTooltips;
BOOL showTooltipsInBackground;
- NSString *dragOperation;
-
BOOL useContactListGroups;
int indentationPerLevel[9];
}
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIAccount.h
--- a/Frameworks/Adium Framework/Source/AIAccount.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIAccount.h Sun Dec 30 16:25:44 2012 -0500
@@ -187,17 +187,10 @@
NSString *formattedUID;
AIStatus *accountStatus;
- BOOL isConnecting;
NSDate *waitingToReconnect;
- BOOL isDisconnecting;
-
- BOOL isWaitingForNetwork;
-
- NSInteger connectionProgressPercent;
+
NSString *connectionProgressString;
- BOOL mustPromptForPasswordOnNextConnect;
-
NSString *currentDisplayName;
id<AIAccountControllerRemoveConfirmationDialog> confirmationDialogForAccountDeletion;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIChat.h
--- a/Frameworks/Adium Framework/Source/AIChat.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIChat.h Sun Dec 30 16:25:44 2012 -0500
@@ -112,23 +112,13 @@
NSMutableSet *ignoredListContacts;
- BOOL enableTypingNotifications;
BOOL hideUserIconAndStatus;
NSMutableSet *customEmoticons;
// Former properties
- NSImage *tabStateIcon;
-
NSDictionary *chatCreationInfo;
-
- NSInteger unviewedMention;
- NSInteger unviewedContent;
-
- NSTimer *enteredTextTimer;
-
- NSInteger ourTypingState;
-
+
NSDictionary *securityDetails;
AIListContact *_listObject;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIColorPickerSliders.h
--- a/Frameworks/Adium Framework/Source/AIColorPickerSliders.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIColorPickerSliders.h Sun Dec 30 16:25:44 2012 -0500
@@ -18,15 +18,6 @@
@interface NSColorPickerSliders:NSColorPicker <NSColorPickingCustom>
{
id sliderModePopUp;
- id slidersView;
- id greySliders;
- id rgbSliders;
- id hsbSliders;
- id cmykSliders;
- id currViewObject;
- id sliderContainer;
- id colorProfileButton;
- int modeMask;
}
- (void)_setupProfileUI;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIEmoticon.h
--- a/Frameworks/Adium Framework/Source/AIEmoticon.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIEmoticon.h Sun Dec 30 16:25:44 2012 -0500
@@ -22,8 +22,7 @@
NSString *name;
NSArray *textEquivalents;
AIEmoticonPack *pack;
- NSString *serviceClass;
-
+
BOOL enabled;
BOOL imageLoaded;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIEmoticonPack.h
--- a/Frameworks/Adium Framework/Source/AIEmoticonPack.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIEmoticonPack.h Sun Dec 30 16:25:44 2012 -0500
@@ -19,7 +19,6 @@
NSString *path;
NSString *name;
NSString *serviceClass;
- NSString *emoticonLocation;
NSMutableArray *emoticonArray;
NSArray *enabledEmoticonArray;
BOOL enabled;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIGroupChat.h
--- a/Frameworks/Adium Framework/Source/AIGroupChat.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIGroupChat.h Sun Dec 30 16:25:44 2012 -0500
@@ -18,8 +18,7 @@
@interface AIGroupChat : AIChat <AIContainingObject> {
NSString *topic;
- AIListContact *topicSetter;
-
+
NSMutableDictionary *participatingContactsFlags;
NSMutableDictionary *participatingContactsAliases;
NSMutableArray *participatingContacts;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIHTMLDecoder.h
--- a/Frameworks/Adium Framework/Source/AIHTMLDecoder.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIHTMLDecoder.h Sun Dec 30 16:25:44 2012 -0500
@@ -50,7 +50,6 @@
BOOL send;
BOOL receive;
BOOL inDiv;
- BOOL inLogSpan;
}
#define AIElementClassAttributeName @"AIElementClass"
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIListBookmark.h
--- a/Frameworks/Adium Framework/Source/AIListBookmark.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIListBookmark.h Sun Dec 30 16:25:44 2012 -0500
@@ -30,8 +30,6 @@
NSString *password;
NSString *name;
-
- NSString *unreadStatus;
}
- (id)initWithChat:(AIChat *)inChat;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIListContact.h
--- a/Frameworks/Adium Framework/Source/AIListContact.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIListContact.h Sun Dec 30 16:25:44 2012 -0500
@@ -30,30 +30,9 @@
// Former properties
NSColor *textColor;
- NSColor *invertedTextColor;
- NSColor *labelColor;
-
- NSNumber *imageOpacity;
- BOOL isEvent;
-
- NSString *ABUniqueID;
-
- NSAttributedString *textProfile;
-
- BOOL isBlocked;
- BOOL isIdle;
NSInteger idle;
- NSDate *idleSince;
- NSString *idleReadable;
-
- BOOL notAStranger;
- BOOL isMobile;
-
- NSString *serverDisplayName;
+
NSString *formattedUID;
-
- BOOL signedOff;
- BOOL signedOn;
}
- (id)initWithUID:(NSString *)inUID account:(AIAccount *)inAccount service:(AIService *)inService;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIListGroup.h
--- a/Frameworks/Adium Framework/Source/AIListGroup.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIListGroup.h Sun Dec 30 16:25:44 2012 -0500
@@ -24,9 +24,6 @@
NSMutableArray *_containedObjects; //Manually ordered array of contents
BOOL expanded; //Exanded/Collapsed state of this object
BOOL loadedExpanded;
-
- // Former properties
- NSString *countText;
}
- (id)initWithUID:(NSString *)inUID;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIListObject.h
--- a/Frameworks/Adium Framework/Source/AIListObject.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIListObject.h Sun Dec 30 16:25:44 2012 -0500
@@ -99,20 +99,6 @@
// Former properties
NSAttributedString *listObjectStatusMessage;
- NSImage *listStateIcon;
- NSImage *listStatusIcon;
-
- BOOL isOnline;
- BOOL alwaysVisible;
-
- NSInteger unviewedContent;
- NSInteger unviewedMention;
-
- NSNumber *listObjectStatusType;
-
- NSString *extendedStatus;
- NSString *listObjectStatusName;
-
NSString *webKitUserIconPath;
}
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIListOutlineView.h
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.h Sun Dec 30 16:25:44 2012 -0500
@@ -34,7 +34,6 @@
NSImage *backgroundImage;
CGFloat backgroundFade;
- BOOL _drawBackground;
AIBackgroundStyle backgroundStyle;
AIContactListWindowStyle windowStyle;
@@ -49,8 +48,6 @@
CGFloat minimumDesiredWidth;
BOOL desiredHeightPadding;
-
- NSArray *draggedItems;
}
@property (readonly, nonatomic) NSInteger desiredHeight;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIMessageEntryTextView.h
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Sun Dec 30 16:25:44 2012 -0500
@@ -53,8 +53,6 @@
NSMutableArray *pushArray;
BOOL pushIndicatorVisible;
NSButton *pushIndicator;
- NSMenu *pushMenu;
- NSDictionary *defaultTypingAttributes;
NSSize lastPostedSize;
NSSize _desiredSizeCached;
diff -r 535c713ff1de -r f0070858ec43 Frameworks/Adium Framework/Source/AIMetaContact.h
--- a/Frameworks/Adium Framework/Source/AIMetaContact.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.h Sun Dec 30 16:25:44 2012 -0500
@@ -32,7 +32,6 @@
BOOL saveGroupingChanges;
BOOL expanded; //Exanded/Collapsed state of this object
- BOOL isExpandable;
}
//The objectID is unique to a meta contact and is used as the UID for purposes of AIListContact inheritance
diff -r 535c713ff1de -r f0070858ec43 Plugins/Bonjour/AWBonjourAccount.h
--- a/Plugins/Bonjour/AWBonjourAccount.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Bonjour/AWBonjourAccount.h Sun Dec 30 16:25:44 2012 -0500
@@ -28,7 +28,6 @@
@interface AWBonjourAccount : AIAccount <AWEzvClientProtocol, AIAccount_Files> {
AWEzv *libezv;
NSMutableSet *libezvContacts;
- NSString *savedAwayMessage;
}
- (void)requestReceiveOfFileTransfer:(ESFileTransfer *)fileTransfer;
diff -r 535c713ff1de -r f0070858ec43 Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h
--- a/Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Bonjour/libezv/Classes/EKEzvFileTransfer.h Sun Dec 30 16:25:44 2012 -0500
@@ -20,7 +20,6 @@
EKFileTransferDirection direction;
float percentComplete;
- float previousPercentComplete;
int status;
NSString *localFilename;
diff -r 535c713ff1de -r f0070858ec43 Plugins/Dual Window Interface/AIMessageViewController.h
--- a/Plugins/Dual Window Interface/AIMessageViewController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Dual Window Interface/AIMessageViewController.h Sun Dec 30 16:25:44 2012 -0500
@@ -55,9 +55,6 @@
AIMessageWindowController *messageWindowController;
- //menuitem
- NSMenuItem *showHide;
-
AIChat *chat;
BOOL suppressSendLaterPrompt;
CGFloat entryMinHeight;
diff -r 535c713ff1de -r f0070858ec43 Plugins/Dual Window Interface/AIMessageWindowController.h
--- a/Plugins/Dual Window Interface/AIMessageWindowController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.h Sun Dec 30 16:25:44 2012 -0500
@@ -52,7 +52,6 @@
NSDictionary *toolbarItems;
NSMutableArray *m_containedChats;
- BOOL toolbar_selectedTabChanged;
NSToolbar *toolbar;
}
diff -r 535c713ff1de -r f0070858ec43 Plugins/Image Uploading Plugin/AIImageShackImageUploader.h
--- a/Plugins/Image Uploading Plugin/AIImageShackImageUploader.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Image Uploading Plugin/AIImageShackImageUploader.h Sun Dec 30 16:25:44 2012 -0500
@@ -21,7 +21,6 @@
NSXMLParser *responseParser;
// Parsing
- NSMutableDictionary *lastElement;
NSString *currentElementName;
NSMutableDictionary *currentElement;
diff -r 535c713ff1de -r f0070858ec43 Plugins/Image Uploading Plugin/AIImgurImageUploader.h
--- a/Plugins/Image Uploading Plugin/AIImgurImageUploader.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Image Uploading Plugin/AIImgurImageUploader.h Sun Dec 30 16:25:44 2012 -0500
@@ -22,7 +22,6 @@
// Parsing
NSMutableDictionary *lastElement;
- NSString *currentElementName;
NSMutableDictionary *currentElement;
NSMutableDictionary *response;
}
diff -r 535c713ff1de -r f0070858ec43 Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.h
--- a/Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.h Sun Dec 30 16:25:44 2012 -0500
@@ -18,8 +18,6 @@
@interface DCInviteToChatPlugin : AIPlugin {
NSMenuItem *menuItem_inviteToChat;
NSMenuItem *menuItem_inviteToChatContext;
-
- BOOL shouldRebuildChatList;
}
- (IBAction)inviteToChat:(id)sender;
diff -r 535c713ff1de -r f0070858ec43 Plugins/Purple Service/CBPurpleAccount.h
--- a/Plugins/Purple Service/CBPurpleAccount.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Plugins/Purple Service/CBPurpleAccount.h Sun Dec 30 16:25:44 2012 -0500
@@ -32,8 +32,6 @@
{
PurpleAccount *account;
- NSMutableDictionary *customEmoticonWaitingDict;
-
NSMutableArray *permittedContactsArray;
NSMutableArray *deniedContactsArray;
diff -r 535c713ff1de -r f0070858ec43 Resources/LogViewer.xib
--- a/Resources/LogViewer.xib Sun Dec 30 15:35:03 2012 -0500
+++ b/Resources/LogViewer.xib Sun Dec 30 16:25:44 2012 -0500
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
- <int key="IBDocument.SystemTarget">1060</int>
+ <int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12C60</string>
- <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3079</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2843</string>
+ <string key="NS.object.0">3079</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSBox</string>
@@ -88,7 +88,7 @@
<string key="NSFrameSize">{177, 535}</string>
<reference key="NSSuperview" ref="981661881"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="55917509"/>
+ <reference key="NSNextKeyView" ref="268459162"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -220,7 +220,7 @@
<string key="NSFrame">{{0, -1}, {177, 535}}</string>
<reference key="NSSuperview" ref="28735003"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="268459162"/>
+ <reference key="NSNextKeyView" ref="981661881"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="666117040"/>
<reference key="NSHScroller" ref="268459162"/>
@@ -263,7 +263,7 @@
<string key="NSFrameSize">{595, 126}</string>
<reference key="NSSuperview" ref="452103105"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="608471247"/>
+ <reference key="NSNextKeyView" ref="529274724"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -276,10 +276,12 @@
<reference key="NSNextKeyView" ref="452103105"/>
<reference key="NSTableView" ref="294998714"/>
</object>
- <object class="_NSCornerView" key="NSCornerView">
- <nil key="NSNextResponder"/>
+ <object class="_NSCornerView" key="NSCornerView" id="713829016">
+ <reference key="NSNextResponder" ref="322940610"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{523, 0}, {16, 17}}</string>
+ <reference key="NSSuperview" ref="322940610"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="452103105"/>
</object>
<array class="NSMutableArray" key="NSTableColumns">
@@ -458,16 +460,18 @@
<reference key="NSBGColor" ref="616840708"/>
<int key="NScvFlags">4</int>
</object>
+ <reference ref="713829016"/>
</array>
<string key="NSFrameSize">{595, 143}</string>
<reference key="NSSuperview" ref="834810345"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="529274724"/>
+ <reference key="NSNextKeyView" ref="452103105"/>
<int key="NSsFlags">133680</int>
<reference key="NSVScroller" ref="611885226"/>
<reference key="NSHScroller" ref="608471247"/>
<reference key="NSContentView" ref="452103105"/>
<reference key="NSHeaderClipView" ref="529274724"/>
+ <reference key="NSCornerView" ref="713829016"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBkAAAQZAAAA</bytes>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
@@ -628,10 +632,10 @@
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</set>
- <string key="NSFrameSize">{595, 357}</string>
+ <string key="NSFrameSize">{580, 357}</string>
<reference key="NSSuperview" ref="358384816"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="194644508"/>
+ <reference key="NSNextKeyView" ref="607861257"/>
<object class="NSTextContainer" key="NSTextContainer" id="79517778">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -647,7 +651,7 @@
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="588573636"/>
- <double key="NSWidth">595</double>
+ <double key="NSWidth">580</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
@@ -690,7 +694,7 @@
<nil key="NSDelegate"/>
</object>
</array>
- <string key="NSFrameSize">{595, 357}</string>
+ <string key="NSFrameSize">{580, 357}</string>
<reference key="NSSuperview" ref="785934659"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="588573636"/>
@@ -725,7 +729,7 @@
<object class="NSScroller" id="194644508">
<reference key="NSNextResponder" ref="785934659"/>
<int key="NSvFlags">256</int>
- <string key="NSFrame">{{579, 0}, {16, 357}}</string>
+ <string key="NSFrame">{{580, 0}, {15, 357}}</string>
<reference key="NSSuperview" ref="785934659"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="291104434"/>
@@ -751,7 +755,7 @@
<string key="NSFrameSize">{595, 357}</string>
<reference key="NSSuperview" ref="196815603"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="607861257"/>
+ <reference key="NSNextKeyView" ref="358384816"/>
<int key="NSsFlags">133136</int>
<reference key="NSVScroller" ref="194644508"/>
<reference key="NSHScroller" ref="607861257"/>
@@ -1159,11 +1163,9 @@
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSSearchField" id="360077433">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{227, 22}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="692075214">
<int key="NSCellFlags">342884416</int>
@@ -1211,11 +1213,9 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSCustomView" id="496523070">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{320, 24}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@@ -1903,7 +1903,6 @@
<string key="selectDate:">id</string>
<string key="selectDateType:">id</string>
<string key="selectNextPreviousOccurrence:">id</string>
- <string key="toggleTimestampFiltering:">id</string>
<string key="updateSearch:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
@@ -1919,10 +1918,6 @@
<string key="name">selectNextPreviousOccurrence:</string>
<string key="candidateClassName">id</string>
</object>
- <object class="IBActionInfo" key="toggleTimestampFiltering:">
- <string key="name">toggleTimestampFiltering:</string>
- <string key="candidateClassName">id</string>
- </object>
<object class="IBActionInfo" key="updateSearch:">
<string key="name">updateSearch:</string>
<string key="candidateClassName">id</string>
@@ -2071,7 +2066,7 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
+ <real value="1070" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
diff -r 535c713ff1de -r f0070858ec43 Resources/NewMessagePrompt.xib
--- a/Resources/NewMessagePrompt.xib Sun Dec 30 15:35:03 2012 -0500
+++ b/Resources/NewMessagePrompt.xib Sun Dec 30 16:25:44 2012 -0500
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
- <int key="IBDocument.SystemTarget">1060</int>
+ <int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">12C60</string>
- <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.InterfaceBuilderVersion">3079</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2843</string>
+ <string key="NS.object.0">3079</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSButton</string>
@@ -999,17 +999,20 @@
<object class="IBPartialClassDescription">
<string key="className">AINewMessagePromptController</string>
<string key="superclassName">AIWindowController</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">textUpdated:</string>
- <string key="NS.object.0">id</string>
- </object>
- <object class="NSMutableDictionary" key="actionInfosByName">
- <string key="NS.key.0">textUpdated:</string>
- <object class="IBActionInfo" key="NS.object.0">
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="okay:">id</string>
+ <string key="textUpdated:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="okay:">
+ <string key="name">okay:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="textUpdated:">
<string key="name">textUpdated:</string>
<string key="candidateClassName">id</string>
</object>
- </object>
+ </dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="button_cancel">NSButton</string>
<string key="button_okay">NSButton</string>
@@ -1146,11 +1149,11 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <real value="1060" key="NS.object.0"/>
+ <real value="1070" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="3200" key="NS.object.0"/>
+ <real value="4000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff -r 535c713ff1de -r f0070858ec43 Source/AIAutoScrollTextView.h
--- a/Source/AIAutoScrollTextView.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIAutoScrollTextView.h Sun Dec 30 16:25:44 2012 -0500
@@ -16,7 +16,6 @@
@interface AIAutoScrollTextView : NSTextView {
NSTimer *scrollTimer;
- NSTimer *eventLoopScrollTimer;
CGFloat scrollLocation;
NSInteger maxScroll;
}
diff -r 535c713ff1de -r f0070858ec43 Source/AIContactListEditorPlugin.h
--- a/Source/AIContactListEditorPlugin.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIContactListEditorPlugin.h Sun Dec 30 16:25:44 2012 -0500
@@ -20,7 +20,6 @@
@interface AIContactListEditorPlugin : AIPlugin {
NSMenuItem *menuItem_delete;
NSMenuItem *menuItem_tabAddContact;
- NSMenuItem *menuItem_addBookmark;
NSMenuItem *menuItem_addContact;
NSMenuItem *menuItem_addContactContext;
NSMenuItem *menuItem_addGroup;
diff -r 535c713ff1de -r f0070858ec43 Source/AIContactStatusColoringPlugin.h
--- a/Source/AIContactStatusColoringPlugin.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIContactStatusColoringPlugin.h Sun Dec 30 16:25:44 2012 -0500
@@ -66,8 +66,7 @@
NSColor *offlineLabelColor;
NSColor *mobileLabelColor;
- CGFloat alpha;
- BOOL offlineImageFading;
+ BOOL offlineImageFading;
NSSet *interestedKeysSet;
}
diff -r 535c713ff1de -r f0070858ec43 Source/AIEventsInspectorPane.h
--- a/Source/AIEventsInspectorPane.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIEventsInspectorPane.h Sun Dec 30 16:25:44 2012 -0500
@@ -18,8 +18,6 @@
@class ESContactAlertsViewController;
@interface AIEventsInspectorPane : NSObject <AIContentInspectorPane> {
- AIListObject *displayedObject;
-
IBOutlet NSView *inspectorContentView;
IBOutlet ESContactAlertsViewController *alertsController;
}
diff -r 535c713ff1de -r f0070858ec43 Source/AIListController.h
--- a/Source/AIListController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIListController.h Sun Dec 30 16:25:44 2012 -0500
@@ -37,8 +37,6 @@
NSRect previousWindowRect;
AIDockToBottomType dockToBottomOfScreen;
-
- BOOL needsAutoResize;
}
- (id)initWithContactList:(id<AIContainingObject>)aContactList
diff -r 535c713ff1de -r f0070858ec43 Source/AIListWindowController.h
--- a/Source/AIListWindowController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIListWindowController.h Sun Dec 30 16:25:44 2012 -0500
@@ -60,19 +60,16 @@
BOOL slideOnlyInBackground;
// refers to the GUI preference. Sometimes this is expressed as dock-like
// sliding instead, sometimes as orderOut:-type hiding.
- BOOL windowShouldBeVisibleInBackground;
BOOL showOnAllSpaces;
// used by the "show contact list" event behavior to prevent the contact list
// from hiding during the amount of time it is to be shown
BOOL preventHiding;
BOOL overrodeWindowLevel;
- NSInteger previousWindowLevel;
//this needs to be stored because we turn the shadow off when the window slides offscreen
BOOL listHasShadow;
- BOOL permitSlidingInForeground;
AIRectEdgeMask windowSlidOffScreenEdgeMask;
NSScreen *windowLastScreen;
NSTimer *slideWindowIfNeededTimer;
diff -r 535c713ff1de -r f0070858ec43 Source/AIMessageWindow.h
--- a/Source/AIMessageWindow.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIMessageWindow.h Sun Dec 30 16:25:44 2012 -0500
@@ -18,7 +18,6 @@
@interface AIMessageWindow : AIDockingWindow {
NSArray *chats;
- id rememberedScriptCommand;
}
@property (weak, readonly) NSArray *chats;
diff -r 535c713ff1de -r f0070858ec43 Source/AISCLViewPlugin.h
--- a/Source/AISCLViewPlugin.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AISCLViewPlugin.h Sun Dec 30 16:25:44 2012 -0500
@@ -39,14 +39,10 @@
AIListWindowController *defaultController;
BOOL hasLoaded;
- NSMenuItem *menuItem_allowDetach;
-
NSMenuItem *menuItem_nextDetached;
NSMenuItem *menuItem_previousDetached;
NSMenuItem *menuItem_consolidate;
- NSDictionary *contextMenuAttach;
-
NSMenuItem *detachMenuItem;
NSMenuItem *attachMenuItem;
NSMenu *attachSubmenu;
diff -r 535c713ff1de -r f0070858ec43 Source/AIStandardListWindowController.h
--- a/Source/AIStandardListWindowController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIStandardListWindowController.h Sun Dec 30 16:25:44 2012 -0500
@@ -42,8 +42,7 @@
ContactListImagePickerPosition imagePickerPosition;
- NSDictionary *toolbarItems;
- AIStatusMenu *statusMenu;
+ AIStatusMenu *statusMenu;
}
diff -r 535c713ff1de -r f0070858ec43 Source/AIXtrasManager.h
--- a/Source/AIXtrasManager.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/AIXtrasManager.h Sun Dec 30 16:25:44 2012 -0500
@@ -28,10 +28,9 @@
#define AIXtraTypeMenuBarIcons @"adiummenubaricons"
@interface AIXtrasManager : AIPreferencePane {
- NSMutableDictionary *disabledXtras;
NSMutableArray *categories;
NSMutableArray *selectedCategory;
- IBOutlet NSTableView *tableView_categories;;
+ IBOutlet NSTableView *tableView_categories;
IBOutlet NSTableView *xtraList;
IBOutlet NSTextView *infoView;
IBOutlet NSScrollView *previewContainerView;
@@ -42,11 +41,7 @@
IBOutlet NSView *view_shelf;
IBOutlet NSView *view_content;
-
- NSString *infoPath;
BOOL showInfo; //YES = info, NO = preview
-
- NSMutableDictionary *toolbarItems;
}
@property (weak) IBOutlet NSButton *removeXtra;
@property (weak) IBOutlet NSButton *findXtras;
diff -r 535c713ff1de -r f0070858ec43 Source/DCMessageContextDisplayPlugin.h
--- a/Source/DCMessageContextDisplayPlugin.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/DCMessageContextDisplayPlugin.h Sun Dec 30 16:25:44 2012 -0500
@@ -30,7 +30,6 @@
@interface DCMessageContextDisplayPlugin : AIPlugin {
BOOL isObserving;
BOOL shouldDisplay;
- BOOL dimRecentContext;
NSInteger linesToDisplay;
}
diff -r 535c713ff1de -r f0070858ec43 Source/ESFileTransferController.h
--- a/Source/ESFileTransferController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/ESFileTransferController.h Sun Dec 30 16:25:44 2012 -0500
@@ -29,7 +29,6 @@
NSSet *safeFileExtensions;
AIFileTransferAutoAcceptType autoAcceptType;
- BOOL autoChooseFolder;
BOOL autoOpenSafe;
BOOL showProgressWindow;
}
diff -r 535c713ff1de -r f0070858ec43 Source/ESFileTransferProgressView.h
--- a/Source/ESFileTransferProgressView.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/ESFileTransferProgressView.h Sun Dec 30 16:25:44 2012 -0500
@@ -27,10 +27,6 @@
IBOutlet NSButton *button_icon;
IBOutlet NSProgressIndicator *progressIndicator;
- NSString *transferBytesStatus;
- NSString *transferRemainingStatus;
- NSString *transferSpeedStatus;
-
IBOutlet AIRolloverButton *button_stopResume;
BOOL buttonStopResumeIsHovered;
BOOL buttonStopResumeIsResend;
diff -r 535c713ff1de -r f0070858ec43 Source/ESFileTransferProgressWindowController.h
--- a/Source/ESFileTransferProgressWindowController.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/ESFileTransferProgressWindowController.h Sun Dec 30 16:25:44 2012 -0500
@@ -20,7 +20,6 @@
@interface ESFileTransferProgressWindowController : AIWindowController <NSOutlineViewDelegate, NSOutlineViewDataSource> {
NSMutableArray *progressRows;
- ESFileTransferProgressRow *selectedRow;
IBOutlet NSScrollView *scrollView;
IBOutlet AIVariableHeightOutlineView *outlineView;
diff -r 535c713ff1de -r f0070858ec43 Source/GBApplescriptFiltersPlugin.h
--- a/Source/GBApplescriptFiltersPlugin.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/GBApplescriptFiltersPlugin.h Sun Dec 30 16:25:44 2012 -0500
@@ -24,11 +24,7 @@
NSMutableArray *flatScriptArray; //Flat array of scripts
NSMutableArray *scriptArray; //Ordered array for script menu
- BOOL buildingScriptMenu;
-
NSToolbarItem *toolbarItem;
-
- NSMutableDictionary *scriptTaskInfoDicts;
}
@end
diff -r 535c713ff1de -r f0070858ec43 Source/NEHGrowlPlugin.h
--- a/Source/NEHGrowlPlugin.h Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/NEHGrowlPlugin.h Sun Dec 30 16:25:44 2012 -0500
@@ -26,8 +26,6 @@
@protocol GrowlApplicationBridgeDelegate;
@interface NEHGrowlPlugin : AIPlugin <AIActionHandler, GrowlApplicationBridgeDelegate> {
- BOOL showWhileAway;
-
NSMutableDictionary *queuedEvents;
}
diff -r 535c713ff1de -r f0070858ec43 Source/NEHGrowlPlugin.m
--- a/Source/NEHGrowlPlugin.m Sun Dec 30 15:35:03 2012 -0500
+++ b/Source/NEHGrowlPlugin.m Sun Dec 30 16:25:44 2012 -0500
@@ -349,11 +349,9 @@
if ([adium.contactAlertsController isMessageEvent:eventID] &&
[userInfo respondsToSelector:@selector(objectForKey:)] &&
[userInfo objectForKey:@"AIContentObject"]) {
- AIListObject *source = [contentObject source];
contentObject = [userInfo objectForKey:@"AIContentObject"];
chat = [userInfo objectForKey:@"AIChat"];
-
- if (source) listObject = source;
+ listObject = [contentObject source] ?: listObject;
}
[clickContext setObject:eventID
More information about the commits
mailing list