adium 3091:dcde2ae5eb5a: Oops... missed this one.
commits at adium.im
commits at adium.im
Tue Dec 29 18:44:57 UTC 2009
details: http://hg.adium.im/adium/rev/dcde2ae5eb5a
revision: 3091:dcde2ae5eb5a
author: Stephen Holt <sholt at adium.im>
date: Tue Dec 29 13:44:29 2009 -0500
Oops... missed this one.
Subject: adium 3092:ffb42621b742: Resolving most* undeclared selectors in Adium.app.
details: http://hg.adium.im/adium/rev/ffb42621b742
revision: 3092:ffb42621b742
author: Stephen Holt <sholt at adium.im>
date: Tue Dec 29 13:44:29 2009 -0500
Resolving most* undeclared selectors in Adium.app.
* "Most" because some selectors seem to have been removed, but runtime invocatoins remain.
Subject: adium 3093:761c67ca2ea3: Turns out, these methods weren't even being called anymore, and were causing warnings (refrences to long since removed selectors). Removing this cruft.
details: http://hg.adium.im/adium/rev/761c67ca2ea3
revision: 3093:761c67ca2ea3
author: Stephen Holt <sholt at adium.im>
date: Tue Dec 29 13:44:29 2009 -0500
Turns out, these methods weren't even being called anymore, and were causing warnings (refrences to long since removed selectors). Removing this cruft.
Subject: adium 3094:c87cbb18aff2: String formatting warning. Oops.
details: http://hg.adium.im/adium/rev/c87cbb18aff2
revision: 3094:c87cbb18aff2
author: Stephen Holt <sholt at adium.im>
date: Tue Dec 29 13:44:29 2009 -0500
String formatting warning. Oops.
diffs (truncated from 1778 to 1000 lines):
diff -r 5370572cdbaf -r c87cbb18aff2 Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Tue Dec 29 01:27:50 2009 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIMenuAdditions.h Tue Dec 29 13:44:29 2009 -0500
@@ -45,5 +45,5 @@
- (id)initWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode representedObject:(id)object;
- (id)initWithTitle:(NSString *)aString target:(id)target action:(SEL)aSelector keyEquivalent:(NSString *)charCode keyMask:(unsigned int)keyMask;
- (void)removeKeyEquivalent;
-
+- (NSComparisonResult)titleCompare:(NSMenuItem *)inMenuItem;
@end
diff -r 5370572cdbaf -r c87cbb18aff2 Frameworks/Adium Framework/Source/AIListOutlineView.h
--- a/Frameworks/Adium Framework/Source/AIListOutlineView.h Tue Dec 29 01:27:50 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIListOutlineView.h Tue Dec 29 13:44:29 2009 -0500
@@ -61,6 +61,7 @@
//Contact menu
@property (readonly, nonatomic) AIListObject *listObject;
@property (readonly, nonatomic) NSArray *arrayOfListObjects;
+ at property (readonly, nonatomic) NSArray *arrayOfListObjectsWithGroups;
@property (readonly, nonatomic) AIListContact *firstVisibleListContact;
//Contacts
diff -r 5370572cdbaf -r c87cbb18aff2 Frameworks/Adium Framework/Source/AIMessageEntryTextView.h
--- a/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Tue Dec 29 01:27:50 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIMessageEntryTextView.h Tue Dec 29 13:44:29 2009 -0500
@@ -79,6 +79,7 @@
- (void)setAttributedString:(NSAttributedString *)inAttributedString;
- (void)setString:(NSString *)string;
- (void)setTypingAttributes:(NSDictionary *)attrs;
+- (void)pasteAsPlainTextWithTraits:(id)sender;
- (void)pasteAsRichText:(id)sender;
- (NSSize)desiredSize;
diff -r 5370572cdbaf -r c87cbb18aff2 Frameworks/ShortcutRecorder/Source/SRRecorderControl.m
--- a/Frameworks/ShortcutRecorder/Source/SRRecorderControl.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Frameworks/ShortcutRecorder/Source/SRRecorderControl.m Tue Dec 29 13:44:29 2009 -0500
@@ -18,6 +18,7 @@
@interface SRRecorderControl ()
- (void)resetTrackingRects;
+- (void)viewFrameDidChange:(NSNotification *)aNotification;
@end
@implementation SRRecorderControl
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvContactManagerListener.m Tue Dec 29 13:44:29 2009 -0500
@@ -44,6 +44,9 @@
#define MAXBACKLOG 5
+ at interface AWEzvContactManager (Listener_Private)
+- (void)connectionReceived:(NSNotification *)aNotification;
+ at end
@implementation AWEzvContactManager (Listener)
/* start listening for incoming connections
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m
--- a/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Bonjour/libezv/Private Classes/AWEzvXMLStream.m Tue Dec 29 13:44:29 2009 -0500
@@ -53,6 +53,8 @@
@interface AWEzvXMLStream ()
- (void) connectionDidEnd;
+- (void) dataReceived:(NSNotification *)aNotification;
+- (void) dataAvailable:(NSNotification *)aNotification;
@end
@implementation AWEzvXMLStream
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/AsyncSocket.m Tue Dec 29 13:44:29 2009 -0500
@@ -1417,7 +1417,7 @@
CFDataRef peeraddr;
UInt16 peerport = 0;
- if(socket && (peeraddr = CFSocketCopyPeerAddress(sock)))
+ if(sock && (peeraddr = CFSocketCopyPeerAddress(sock)))
{
peerport = [self addressPort:peeraddr];
CFRelease (peeraddr);
@@ -1432,7 +1432,7 @@
CFDataRef selfaddr;
NSString *selfstr = nil;
- if(sock && (selfaddr = CFSocketCopyAddress(socket)))
+ if(sock && (selfaddr = CFSocketCopyAddress(sock)))
{
selfstr = [self addressHost:selfaddr];
CFRelease (selfaddr);
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m
--- a/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Bonjour/libezv/Simple HTTP Server/HTTPServer.m Tue Dec 29 13:44:29 2009 -0500
@@ -23,6 +23,10 @@
#pragma mark -
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+ at interface HTTPServer ()
+- (void)connectionDidDie:(NSNotification *)notification;
+ at end
+
@implementation HTTPServer
/**
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m
--- a/Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Contact Status Dock Overlays/AIContactStatusDockOverlaysPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -43,6 +43,8 @@
- (void)_setOverlay;
- (NSImage *)overlayImageFlash:(BOOL)flash;
- (void)flushPreferenceColorCache;
+- (void)chatClosed:(NSNotification *)notification;
+- (void)removeDockOverlay:(NSTimer *)removeTimer;
@end
@implementation AIContactStatusDockOverlaysPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Dual Window Interface/AIJumpControlPlugin.m
--- a/Plugins/Dual Window Interface/AIJumpControlPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Dual Window Interface/AIJumpControlPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -19,6 +19,9 @@
@interface AIJumpControlPlugin()
- (NSObject<AIMessageDisplayController> *)currentController;
+- (void)jumpToPrevious;
+- (void)jumpToNext;
+- (void)jumpToFocus;
@end
@implementation AIJumpControlPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Dual Window Interface/AIMessageTabViewItem.m
--- a/Plugins/Dual Window Interface/AIMessageTabViewItem.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Dual Window Interface/AIMessageTabViewItem.m Tue Dec 29 13:44:29 2009 -0500
@@ -38,6 +38,9 @@
- (void)setLargeImage:(NSImage *)inImage;
- (void)updateTabStatusIcon;
- (void)updateTabContactIcon;
+
+- (void)chatSourceOrDestinationChanged:(NSNotification *)notification;
+- (void)chatAttributesChanged:(NSNotification *)notification;
@end
@implementation AIMessageTabViewItem
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m Tue Dec 29 13:44:29 2009 -0500
@@ -92,6 +92,10 @@
- (void)updateUserCount;
- (NSArray *)contactsMatchingBeginningString:(NSString *)partialWord;
+
+- (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
+- (void)gotFilteredMessageToSendLater:(NSAttributedString *)filteredMessage receivingContext:(NSMutableDictionary *)alertDict;
+- (void)outgoingTextViewDesiredSizeDidChange:(NSNotification *)notification;
@end
@implementation AIMessageViewController
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -39,6 +39,7 @@
#import <PSMTabBarControl/PSMTabStyle.h>
#import "AIMessageTabSplitView.h"
#import <Adium/AIStatusIcons.h>
+#import "AIInterfaceController.h"
#define KEY_MESSAGE_WINDOW_POSITION @"Message Window"
@@ -61,6 +62,10 @@
- (void)_updateWindowTitleAndIcon;
- (NSString *)_frameSaveKey;
- (void)_reloadContainedChats;
+
+- (void)tabDraggingNotificationReceived:(NSNotification *)notification;
+- (void)tabBarFrameChanged:(NSNotification *)notification;
+- (void)closeAlertDidEnd:(NSAlert *)alert returnCode:(int)result contextInfo:(void *)contextInfo;
@end
//Used to squelch compiler warnings on this private call
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Emoticons/AIEmoticonPreferences.m
--- a/Plugins/Emoticons/AIEmoticonPreferences.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Emoticons/AIEmoticonPreferences.m Tue Dec 29 13:44:29 2009 -0500
@@ -37,6 +37,9 @@
- (void)_configureEmoticonListForSelection;
- (void)moveSelectedPacksToTrash;
- (void)configurePreviewControllers;
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
+- (void)trashConfirmSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
@implementation AIEmoticonPreferences
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m
--- a/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -26,6 +26,7 @@
- (void)uploadImage;
- (void)insertImageAddress:(NSString *)inAddress intoTextView:(NSTextView *)textView;
+- (void)setImageUploader:(NSMenuItem *)menuItem;
@end
@implementation AIImageUploaderPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Image Uploading Plugin/AIImageUploaderWindowController.m
--- a/Plugins/Image Uploading Plugin/AIImageUploaderWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Image Uploading Plugin/AIImageUploaderWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -16,6 +16,8 @@
- (id)initWithWindowNibName:(NSString *)nibName
delegate:(id)inDelegate
chat:(AIChat *)inChat;
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
@implementation AIImageUploaderWindowController
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.m
--- a/Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -32,6 +32,7 @@
@interface DCInviteToChatPlugin ()
- (NSMenu *)groupChatMenuForContact:(AIListContact *)contact;
+- (void)dummyTarget:(id)sender;
@end
@implementation DCInviteToChatPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Link Management/SHLinkEditorWindowController.m
--- a/Plugins/Link Management/SHLinkEditorWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Link Management/SHLinkEditorWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -29,6 +29,12 @@
- (id)initWithWindowNibName:(NSString *)windowNibName forTextView:(NSTextView *)inTextView notifyingTarget:(id)inTarget;
- (void)insertLinkTo:(NSURL *)urlString withText:(NSString *)linkString inView:(NSTextView *)inView;
- (void)informTargetOfLink;
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+ at end
+
+ at interface NSObject (SHLinkEditorAdditions)
+- (void)linkEditorLinkDidChange:(NSDictionary *)linkDict;
@end
@implementation SHLinkEditorWindowController
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Link Management/SHLinkManagementPlugin.m
--- a/Plugins/Link Management/SHLinkManagementPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Link Management/SHLinkManagementPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -32,6 +32,8 @@
@interface SHLinkManagementPlugin ()
- (BOOL)textViewSelectionIsLink:(NSTextView *)textView;
- (void)registerToolbarItem;
+- (void)editFormattedLink:(id)sender;
+- (void)removeFormattedLink:(id)sender;
@end
@implementation SHLinkManagementPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Nudge and Buzz Handler/AINudgeBuzzHandlerPlugin.m
--- a/Plugins/Nudge and Buzz Handler/AINudgeBuzzHandlerPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Nudge and Buzz Handler/AINudgeBuzzHandlerPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -44,6 +44,7 @@
// AIListObject interaction
- (void)sendNotification:(AIListObject *)object;
+- (void)notifyContact:(id)sender;
// Notifications.
- (void)nudgeBuzzDidOccur:(NSNotification *)notification;
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Purple Service/ESPurpleYahooAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleYahooAccountViewController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Purple Service/ESPurpleYahooAccountViewController.m Tue Dec 29 13:44:29 2009 -0500
@@ -24,10 +24,6 @@
- (NSMenu *)chatServerMenu;
@end
- at interface NSMenuItem (ItemCreationAdditionsMethods)
-- (NSComparisonResult)titleCompare:(NSMenuItem *)inMenuItem;
- at end
-
@implementation ESPurpleYahooAccountViewController
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Tue Dec 29 13:44:29 2009 -0500
@@ -220,7 +220,7 @@
break;
default:
fprintf(stderr,"SocketRead: read(%lu) error %d\n",
- bytesToGo, theErr);
+ (unsigned long)bytesToGo, theErr);
rtn = errSSLFatalAlert;
break;
}
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -52,6 +52,11 @@
- (NSMenu *)_secureMessagingMenu;
- (void)_updateToolbarIconOfChat:(AIChat *)inChat inWindow:(NSWindow *)window;
- (void)_updateToolbarItem:(NSToolbarItem *)item forChat:(AIChat *)chat;
+- (void) toolbarDidAddItem:(NSToolbarItem *)item;
+
+- (void)toggleSecureMessaging:(id)sender;
+- (void)chatDidBecomeVisible:(NSNotification *)notification;
+- (void)dummyAction:(id)sender;
@end
@implementation ESSecureMessagingPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Status Menu Item/CBStatusMenuItemController.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Status Menu Item/CBStatusMenuItemController.m Tue Dec 29 13:44:29 2009 -0500
@@ -38,6 +38,7 @@
#import <AIUtilities/AIStringAdditions.h>
// For the KEY_SHOW_OFFLINE_CONTACTS and PREF_GROUP_CONTACT_LIST_DISPLAY
#import "AIContactController.h"
+#import "AIInterfaceController.h"
#define STATUS_ITEM_MARGIN 8
@@ -49,6 +50,10 @@
- (void)updateUnreadCount;
- (void)updateOpenChats;
- (void)updateStatusItemLength;
+
+- (void)switchToChat:(id)sender;
+- (void)activateAccountList:(id)sender;
+- (void)disableStatusItem:(id)sender;
@end
@implementation CBStatusMenuItemController
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Status Menu Item/CBStatusMenuItemPlugin.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Status Menu Item/CBStatusMenuItemPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -18,6 +18,11 @@
#import <AIUtilities/AIDictionaryAdditions.h>
#import <AIUtilities/AIApplicationAdditions.h>
+ at interface CBStatusMenuItemPlugin()
+- (void)adiumFinishedLaunching:(NSNotification *)notification;
+ at end
+
+
@implementation CBStatusMenuItemPlugin
- (void)installPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Twitter Plugin/AITwitterAccount.m
--- a/Plugins/Twitter Plugin/AITwitterAccount.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccount.m Tue Dec 29 13:44:29 2009 -0500
@@ -67,6 +67,10 @@
- (void)displayQueuedUpdatesForRequestType:(AITwitterRequestType)requestType;
- (void)getRateLimitAmount;
+
+- (void)openUserPage:(NSMenuItem *)menuItem;
+- (void)enableOrDisableNotifications:(NSMenuItem *)menuItem;
+- (void)replyToTweet;
@end
@implementation AITwitterAccount
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Twitter Plugin/AITwitterAccountOAuthSetup.m
--- a/Plugins/Twitter Plugin/AITwitterAccountOAuthSetup.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Twitter Plugin/AITwitterAccountOAuthSetup.m Tue Dec 29 13:44:29 2009 -0500
@@ -18,6 +18,14 @@
#import <OAuthConsumer/OAuthConsumer.h>
+ at interface AITwitterAccountOAuthSetup ()
+- (void)requestTokenTicket:(OAServiceTicket *)ticket didFinishWithData:(NSData *)data;
+- (void)requestTokenTicket:(OAServiceTicket *)ticket didFailWithError:(NSError *)error;
+
+- (void)accessTokenTicket:(OAServiceTicket *)ticket didFinishWithData:(NSData *)data;
+- (void)accessTokenTicket:(OAServiceTicket *)ticket didFailWithError:(NSError *)error;
+ at end
+
@implementation AITwitterAccountOAuthSetup
- (id)initWithDelegate:(id <AITwitterAccountOAuthSetupDelegate>)inDelegate
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/Twitter Plugin/AITwitterURLHandler.m
--- a/Plugins/Twitter Plugin/AITwitterURLHandler.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/Twitter Plugin/AITwitterURLHandler.m Tue Dec 29 13:44:29 2009 -0500
@@ -32,6 +32,10 @@
#import <Adium/AIInterfaceControllerProtocol.h>
#import <Adium/AIContentControllerProtocol.h>
+ at interface AITwitterURLHandler ()
+- (void)urlRequest:(NSNotification *)notification;
+ at end
+
@implementation AITwitterURLHandler
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/WebKit Message View/AIWebKitDelegate.m
--- a/Plugins/WebKit Message View/AIWebKitDelegate.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/WebKit Message View/AIWebKitDelegate.m Tue Dec 29 13:44:29 2009 -0500
@@ -12,6 +12,10 @@
static AIWebKitDelegate *AISharedWebKitDelegate;
+ at interface AIWebKitMessageViewController (DelegateCallbacks)
+- (void)webViewIsReady;
+ at end
+
@implementation AIWebKitDelegate
- (id)init
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/WebKit Message View/AIWebKitMessageViewController.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewController.m Tue Dec 29 13:44:29 2009 -0500
@@ -90,6 +90,13 @@
- (JVMarkedScroller *)markedScroller;
- (NSNumber *)currentOffsetHeight;
- (void)markCurrentLocation;
+
+- (void)contentObjectAdded:(NSNotification *)notification;
+- (void)chatDidFinishAddingUntrackedContent:(NSNotification *)notification;
+- (void)customEmoticonUpdated:(NSNotification *)inNotification;
+- (void)savePanelDidEnd:(NSSavePanel *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
+- (void)listObjectAttributesChanged:(NSNotification *)notification;
+- (BOOL)zoomImage:(DOMHTMLImageElement *)img;
@end
@interface DOMDocument (FutureWebKitPublicMethodsIKnow)
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m
--- a/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/WebKit Message View/AIWebKitMessageViewPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -29,6 +29,7 @@
@interface AIWebKitMessageViewPlugin ()
- (void) resetStylesForType:(AIWebkitStyleType)styleType;
+- (void) xtrasChanged:(NSNotification *)notification;
@end
@implementation AIWebKitMessageViewPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Plugins/WebKit Message View/AIWebkitMessageViewStyle.m
--- a/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Plugins/WebKit Message View/AIWebkitMessageViewStyle.m Tue Dec 29 13:44:29 2009 -0500
@@ -56,6 +56,10 @@
// We set back, when the user finishes editing, the correct topic, which wipes out the existance of the span before. We don't need to undo the dbl click action.
#define TOPIC_INDIVIDUAL_WRAPPER @"<span id=\"topicEdit\" ondblclick=\"this.setAttribute('contentEditable', true); this.focus();\">%@</span>"
+ at interface NSString (NewSnowLeopardMethods)
+- (NSComparisonResult)localizedStandardCompare:(NSString *)string;
+ at end
+
@interface NSMutableString (AIKeywordReplacementAdditions)
- (void) replaceKeyword:(NSString *)word withString:(NSString *)newWord;
- (void) safeReplaceCharactersInRange:(NSRange)range withString:(NSString *)newWord;
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAccountListPreferences.m
--- a/Source/AIAccountListPreferences.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAccountListPreferences.m Tue Dec 29 13:44:29 2009 -0500
@@ -54,6 +54,11 @@
- (void)calculateAllHeights;
- (void)updateReconnectTime:(NSTimer *)timer;
+
+- (void)iconPackDidChange:(NSNotification *)notification;
+- (void)updateAccountsForStatus:(id)sender;
+- (void)toggleOnlineForAccounts:(id)sender;
+- (void)toggleEnabledForAccounts:(id)sender;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAccountMenuAccessPlugin.m
--- a/Source/AIAccountMenuAccessPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAccountMenuAccessPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -23,6 +23,10 @@
#import "AIGuestAccountWindowController.h"
+ at interface AIAccountMenuAccessPlugin ()
+- (void)showGuestAccountWindow:(id)sender;
+ at end
+
/*!
* @class AIAccountMenuAccessPlugin
* @brief Provide menu access to account connection/disconnect
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAddBookmarkPlugin.m
--- a/Source/AIAddBookmarkPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAddBookmarkPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -23,6 +23,11 @@
#define ADD_BOOKMARK AILocalizedString(@"Add Group Chat Bookmark", "Add a chat bookmark")
#define ADD_BOOKMARK_CONTEXT_MENU AILocalizedString(@"Add Bookmark", "Add a chat bookmark (context menu)")
+ at interface AIAddBookmarkPlugin ()
+- (void)addBookmark:(id)sender;
+- (void)addBookmarkContext:(id)sender;
+ at end
+
@implementation AIAddBookmarkPlugin
/*!
* @name installPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAddressBookInspectorPane.m
--- a/Source/AIAddressBookInspectorPane.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAddressBookInspectorPane.m Tue Dec 29 13:44:29 2009 -0500
@@ -15,6 +15,10 @@
#define ADDRESS_BOOK_NIB_NAME (@"AIAddressBookInspectorPane")
+ at interface AIAddressBookInspectorPane ()
+- (void)didEndSheet:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
+ at end
+
@implementation AIAddressBookInspectorPane
- (id)init
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAdium.m
--- a/Source/AIAdium.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAdium.m Tue Dec 29 13:44:29 2009 -0500
@@ -73,6 +73,14 @@
- (void)completeLogin;
- (void)openAppropriatePreferencesIfNeeded;
- (void)deleteTemporaryFiles;
+
+- (void)handleURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
+- (void)systemTimeZoneDidChange:(NSNotification *)inNotification;
+- (void)kickRunLoop:(NSTimer *)dummy;
+- (void)confirmQuitQuestion:(NSNumber *)number userInfo:(id)info suppression:(NSNumber *)suppressed;
+- (void)fileTransferQuitQuestion:(NSNumber *)number userInfo:(id)info suppression:(NSNumber *)suppressed;
+- (void)openChatQuitQuestion:(NSNumber *)number userInfo:(id)info suppression:(NSNumber *)suppressed;
+- (void)unreadQuitQuestion:(NSNumber *)number userInfo:(id)info suppression:(NSNumber *)suppressed;
@end
@implementation AIAdium
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAdvancedInspectorPane.m
--- a/Source/AIAdvancedInspectorPane.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAdvancedInspectorPane.m Tue Dec 29 13:44:29 2009 -0500
@@ -35,6 +35,8 @@
@interface AIAdvancedInspectorPane()
- (void)reloadPopup;
- (void)configureControlDimming;
+- (void)addNewGroup:(id)sender;
+- (void)newGroupControllerDidEnd:(NSNotification *)notification;
@end
@implementation AIAdvancedInspectorPane
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAliasSupportPlugin.m
--- a/Source/AIAliasSupportPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAliasSupportPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -37,6 +37,7 @@
@interface AIAliasSupportPlugin ()
- (NSSet *)_applyAlias:(NSString *)inAlias toObject:(AIListObject *)inObject notify:(BOOL)notify;
- (NSMenu *)_contactNameMenu;
+- (void)applyAliasRequested:(NSNotification *)notification;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAppearancePreferences.m
--- a/Source/AIAppearancePreferences.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAppearancePreferences.m Tue Dec 29 13:44:29 2009 -0500
@@ -49,6 +49,8 @@
- (void)_rebuildEmoticonMenuAndSelectActivePack;
- (void)_addWindowStyleOption:(NSString *)option withTag:(NSInteger)tag toMenu:(NSMenu *)menu;
- (void)_updateSliderValues;
+- (void)_editListThemeWithName:(NSString *)name;
+- (void)_editListLayoutWithName:(NSString *)name;
- (void)xtrasChanged:(NSNotification *)notification;
- (void)configureDockIconMenu;
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAppearancePreferencesPlugin.m
--- a/Source/AIAppearancePreferencesPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAppearancePreferencesPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -29,6 +29,10 @@
#define APPEARANCE_DEFAULT_PREFS @"AppearanceDefaults"
+ at interface AIAppearancePreferencesPlugin ()
+- (void)invalidStatusSetActivated:(NSNotification *)inNotification;
+ at end
+
@implementation AIAppearancePreferencesPlugin
- (void)installPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAutoReplyPlugin.m
--- a/Source/AIAutoReplyPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAutoReplyPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -25,6 +25,12 @@
#import <Adium/AIStatus.h>
#import <Adium/AIContentObject.h>
+ at interface AIAutoReplyPlugin ()
+- (void)didReceiveContent:(NSNotification *)notification;
+- (void)didSendContent:(NSNotification *)notification;
+- (void)chatWillClose:(NSNotification *)notification;
+ at end
+
/*!
* @class AIAutoReplyPlugin
* @brief Provides AutoReply functionality for the state system
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIAutoScrollTextView.m
--- a/Source/AIAutoScrollTextView.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIAutoScrollTextView.m Tue Dec 29 13:44:29 2009 -0500
@@ -22,6 +22,7 @@
@interface AIAutoScrollTextView (Private)
- (void)startScrolling;
- (void)stopScrolling;
+- (void)scrollTimer:(NSTimer *)scrollTimer;
@end
@implementation AIAutoScrollTextView
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIChatConsolidationPlugin.m
--- a/Source/AIChatConsolidationPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIChatConsolidationPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -26,6 +26,11 @@
#define CONSOLIDATE_CHATS_MENU_TITLE AILocalizedString(@"Consolidate Chats",nil)
#define NEW_TAB_MENU_TITLE AILocalizedString(@"Move Chat to New Window",nil)
+ at interface AIChatConsolidationPlugin ()
+- (void)consolidateChats:(id)sender;
+- (void)moveChatToNewWindow:(id)sender;
+ at end
+
/*!
* @class AIChatConsolidationPlugin
* @brief Component which provides the Conslidate Chats menu item
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIChatController.m
--- a/Source/AIChatController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIChatController.m Tue Dec 29 13:44:29 2009 -0500
@@ -29,6 +29,12 @@
@interface AIChatController ()
- (NSSet *)_informObserversOfChatStatusChange:(AIChat *)inChat withKeys:(NSSet *)modifiedKeys silent:(BOOL)silent;
- (void)chatAttributesChanged:(AIChat *)inChat modifiedKeys:(NSSet *)inModifiedKeys;
+
+- (void)toggleIgnoreOfContact:(id)sender;
+- (void)toggleShowJoinLeave:(id)sender;
+- (void)didExchangeContent:(NSNotification *)notification;
+
+- (void)adiumWillTerminate:(NSNotification *)inNotification;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIChatLog.h
--- a/Source/AIChatLog.h Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIChatLog.h Tue Dec 29 13:44:29 2009 -0500
@@ -50,5 +50,6 @@
- (NSComparisonResult)compareDateReverse:(AIChatLog *)inLog;
- (NSComparisonResult)compareService:(AIChatLog *)inLog;
- (NSComparisonResult)compareServiceReverse:(AIChatLog *)inLog;
-
+- (NSComparisonResult)compareRank:(AIChatLog *)inLog;
+- (NSComparisonResult)compareRankReverse:(AIChatLog *)inLog;
@end
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactController.h
--- a/Source/AIContactController.h Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactController.h Tue Dec 29 13:44:29 2009 -0500
@@ -53,3 +53,7 @@
- (NSEnumerator *)contactEnumerator;
- (NSEnumerator *)groupEnumerator;
@end
+
+ at interface NSObject (AIContactControllerInspector)
+- (void)selectGroup:(id)sender;
+ at end
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactController.m
--- a/Source/AIContactController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactController.m Tue Dec 29 13:44:29 2009 -0500
@@ -101,6 +101,9 @@
- (void)_didChangeContainer:(AIListObject<AIContainingObject> *)inContainingObject object:(AIListObject *)object;
- (void)prepareShowHideGroups;
- (void)_performChangeOfUseContactListGroups;
+- (void)didSendContent:(NSNotification *)notification;
+- (void)toggleShowGroups:(id)sender;
+- (void)toggleShowGroupsToolbar:(id)sender;
//MetaContacts
- (BOOL)_restoreContactsToMetaContact:(AIMetaContact *)metaContact;
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactInfoWindowPlugin.m
--- a/Source/AIContactInfoWindowPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactInfoWindowPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -35,6 +35,8 @@
@interface AIContactInfoWindowPlugin ()
- (void)prepareContactInfo;
+- (void)contactListDidBecomeMain:(NSNotification *)notification;
+- (void)contactListDidResignMain:(NSNotification *)notification;
@end
@implementation AIContactInfoWindowPlugin
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactListEditorPlugin.m
--- a/Source/AIContactListEditorPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactListEditorPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -59,6 +59,11 @@
@interface AIContactListEditorPlugin ()
- (void)deleteFromArray:(NSArray *)array;
- (void)promptForNewContactOnWindow:(NSWindow *)inWindow selectedListObject:(AIListObject *)inListObject;
+
+- (void)addContactFromTab:(id)sender;
+- (void)addContactRequest:(NSNotification *)notification;
+- (void)deleteSelection:(id)sender;
+- (void)deleteSelectionFromTab:(id)sender;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactListImagePicker.m
--- a/Source/AIContactListImagePicker.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactListImagePicker.m Tue Dec 29 13:44:29 2009 -0500
@@ -19,6 +19,10 @@
#define ARROW_XOFFSET 2
#define ARROW_YOFFSET 3
+ at interface AIContactListImagePicker ()
+- (void)frameDidChange:(NSNotification *)inNotification;
+ at end
+
@implementation AIContactListImagePicker
- (void)configureTracking
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactListRecentImagesWindowController.m
--- a/Source/AIContactListRecentImagesWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactListRecentImagesWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -29,6 +29,7 @@
- (id)initWithWindowNibName:(NSString *)inWindowNibName
imagePicker:(AIContactListImagePicker *)inPicker;
- (void)fadeOutAndClose;
+- (void)parentWindowWillClose:(NSNotification *)aNotification;
@end
@implementation AIContactListRecentImagesWindowController
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactSortSelectionPlugin.m
--- a/Source/AIContactSortSelectionPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactSortSelectionPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -34,6 +34,10 @@
- (void)_setActiveSortControllerFromPreferences;
- (void)_setConfigureSortMenuItemTitleForController:(AISortController *)controller;
- (void)_configureSortSelectionMenuItems;
+
+- (void)adiumFinishedLaunching:(NSNotification *)notification;
+- (void)changedSortSelection:(id)sender;
+- (void)configureSort:(id)sender;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContactVisibilityControlPlugin.m
--- a/Source/AIContactVisibilityControlPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContactVisibilityControlPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -41,6 +41,7 @@
@interface AIContactVisibilityControlPlugin()
- (void)updateAccountMenu;
+- (void)toggleHide:(id)sender;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContentController.h
--- a/Source/AIContentController.h Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContentController.h Tue Dec 29 13:44:29 2009 -0500
@@ -33,3 +33,7 @@
}
@end
+
+ at interface NSObject (AIContentController_EncryptionMenuNotifyingTarget)
+- (void)selectedEncryptionPreference:(id)sender;
+ at end
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIContentController.m
--- a/Source/AIContentController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIContentController.m Tue Dec 29 13:44:29 2009 -0500
@@ -61,6 +61,12 @@
- (void)displayContentObject:(AIContentObject *)inObject immediately:(BOOL)immediately;
- (BOOL)processAndSendContentObject:(AIContentObject *)inContentObject;
+
+- (void)didFilterAttributedString:(NSAttributedString *)filteredMessage receivingContext:(AIContentObject *)inObject;
+- (void)didFilterAttributedString:(NSAttributedString *)filteredString contentSendingContext:(AIContentObject *)inObject;
+- (void)didFilterAttributedString:(NSAttributedString *)filteredString autoreplySendingContext:(AIContentObject *)inObject;
+- (void)didFilterAttributedString:(NSAttributedString *)filteredString contentFilterDisplayContext:(AIContentObject *)inObject;
+- (void)didFilterAttributedString:(NSAttributedString *)filteredString displayContext:(AIContentObject *)inObject;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIDockController.m
--- a/Source/AIDockController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIDockController.m Tue Dec 29 13:44:29 2009 -0500
@@ -42,6 +42,9 @@
- (BOOL)_bounceWithInterval:(double)delay;
- (AIIconState *)iconStateFromStateDict:(NSDictionary *)stateDict folderPath:(NSString *)folderPath;
- (void)updateAppBundleIcon;
+
+- (void)appWillChangeActive:(NSNotification *)notification;
+- (void)bounceWithTimer:(NSTimer *)timer;
@end
@implementation AIDockController
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIDockIconSelectionSheet.m
--- a/Source/AIDockIconSelectionSheet.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIDockIconSelectionSheet.m Tue Dec 29 13:44:29 2009 -0500
@@ -30,6 +30,9 @@
- (void)selectIconWithName:(NSString *)selectName;
- (void)xtrasChanged:(NSNotification *)notification;
- (void)selectIconWithName:(NSString *)selectName;
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
+- (void)trashConfirmSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)selectedIconPath;
@end
@implementation AIDockIconSelectionSheet
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIDockUnviewedContentPlugin.m
--- a/Source/AIDockUnviewedContentPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIDockUnviewedContentPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -25,6 +25,7 @@
@interface AIDockUnviewedContentPlugin ()
- (void)removeAlert;
+- (void)chatWillClose:(NSNotification *)notification;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIEditAccountWindowController.m
--- a/Source/AIEditAccountWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIEditAccountWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -38,6 +38,8 @@
- (void)_localizeTabViewItemLabels;
- (void)saveConfiguration;
- (void)configureControlDimming;
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
/*!
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIExtendedStatusPlugin.m
--- a/Source/AIExtendedStatusPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIExtendedStatusPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -67,11 +67,11 @@
BOOL oldShowIdle = showIdle;
BOOL oldIncludeIdleInExtendedStatus = includeIdleInExtendedStatus;
- EXTENDED_STATUS_STYLE statusStyle = [[prefDict objectForKey:KEY_LIST_LAYOUT_EXTENDED_STATUS_STYLE] intValue];
+ EXTENDED_STATUS_STYLE statusStyle = [(NSNumber *)[prefDict objectForKey:KEY_LIST_LAYOUT_EXTENDED_STATUS_STYLE] intValue];
showStatus = ((statusStyle == STATUS_ONLY) || (statusStyle == IDLE_AND_STATUS));
showIdle = ((statusStyle == IDLE_ONLY) || (statusStyle == IDLE_AND_STATUS));
- EXTENDED_STATUS_POSITION statusPosition = [[prefDict objectForKey:KEY_LIST_LAYOUT_EXTENDED_STATUS_POSITION] intValue];
+ EXTENDED_STATUS_POSITION statusPosition = [(NSNumber *)[prefDict objectForKey:KEY_LIST_LAYOUT_EXTENDED_STATUS_POSITION] intValue];
includeIdleInExtendedStatus = (statusPosition != EXTENDED_STATUS_POSITION_BOTH);
if (firstTime) {
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIHoveringPopUpButton.m
--- a/Source/AIHoveringPopUpButton.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIHoveringPopUpButton.m Tue Dec 29 13:44:29 2009 -0500
@@ -8,6 +8,10 @@
#import "AIHoveringPopUpButton.h"
#import "AIHoveringPopUpButtonCell.h"
+ at interface AIHoveringPopUpButton ()
+- (void)frameDidChange:(NSNotification *)inNotification;
+ at end
+
@implementation AIHoveringPopUpButton
+ (void)initialize {
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIInterfaceController.m
--- a/Source/AIInterfaceController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIInterfaceController.m Tue Dec 29 13:44:29 2009 -0500
@@ -45,6 +45,7 @@
#import "AIMessageTabViewItem.h"
#import "KNShelfSplitview.h"
#import <Adium/AIContactList.h>
+#import "AIListOutlineView.h"
#import "AIMessageViewController.h"
@@ -59,6 +60,10 @@
//#define LOG_RESPONDER_CHAIN
+ at interface NSObject (AIInterfaceController_WindowPrefsTarget)
+- (void)selectedWindowLevel:(id)sender;
+ at end
+
@interface AIInterfaceController ()
- (void)_resetOpenChatsCache;
- (void)_addItemToMainMenuAndDock:(NSMenuItem *)item;
@@ -69,6 +74,16 @@
- (void)saveContainers;
- (void)restoreSavedContainers;
+- (void)saveContainersOnQuit:(NSNotification *)notification;
+
+- (void)toggleUserlist:(id)sender;
+- (void)toggleUserlistSide:(id)sender;
+- (void)clearDisplay:(id)sender;
+- (void)closeContextualChat:(id)sender;
+- (void)openAuthorizationWindow:(id)sender;
+- (void)didReceiveContent:(NSNotification *)notification;
+- (void)adiumDidFinishLoading:(NSNotification *)inNotification;
+- (void)flashTimer:(NSTimer *)inTimer;
//Window Menu
- (void)updateActiveWindowMenuItem;
@@ -674,7 +689,7 @@
while ((chat = [chatEnumerator nextObject])) {
[interfacePlugin moveChat:chat
toContainerWithID:firstContainerID
- idx:-1];
+ index:-1];
}
[openChats release];
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIListController.m
--- a/Source/AIListController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIListController.m Tue Dec 29 13:44:29 2009 -0500
@@ -56,6 +56,7 @@
@interface AIListController ()
- (void)promptToCombineItems:(NSArray *)items withContact:(AIListContact *)inContact;
+- (void)mergeContactSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
@implementation AIListController
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIListLayoutWindowController.m
--- a/Source/AIListLayoutWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIListLayoutWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -38,6 +38,7 @@
- (NSMenu *)positionMenuWithChoices:(NSInteger [])positionChoices;
- (NSMenu *)extendedStatusStyleMenu;
- (NSMenu *)extendedStatusPositionMenu;
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
@implementation AIListLayoutWindowController
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIListObjectContentsPlugin.m
--- a/Source/AIListObjectContentsPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIListObjectContentsPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -38,6 +38,11 @@
#define MORE_CONTACTS_STRING AILocalizedString(@"%d others", @"Used to describe omitted contacts.\
The first parameter is the number of omitted contacts")
+ at interface AIListObjectContentsPlugin ()
+- (void)toggleMetaContactExpansion:(id)sender;
+- (void)inspectedObjectDidChange:(NSNotification *)inNotification;
+ at end
+
/*!
* @class AIListObjectContentsPlugin
* @brief Tooltip component: Show the contacts contained by metaContacts, with service and status state.
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIListThemeWindowController.m
--- a/Source/AIListThemeWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIListThemeWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -30,6 +30,7 @@
- (void)updateSliderValues;
- (void)configureBackgroundColoring;
- (NSMenu *)displayImageStyleMenu;
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
@implementation AIListThemeWindowController
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AIListWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -65,6 +65,8 @@
- (void)showFilterBarWithAnimation:(BOOL)flag;
- (void)hideFilterBarWithAnimation:(BOOL)flag;
- (void)animateFilterBarWithDuration:(CGFloat)duration;
+
+- (void)screenParametersChanged:(NSNotification *)notification;
@end
@implementation AIListWindowController
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AILogViewerWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -96,6 +96,10 @@
- (void)_didOpenForContact;
- (void)deleteSelection:(id)sender;
+
+- (void)outlineViewSelectionDidChangeDelayed;
+- (void)openChatOnDoubleAction:(id)sender;
+- (void)deleteLogsAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
@implementation AILogViewerWindowController
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AILoggerPlugin.m
--- a/Source/AILoggerPlugin.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AILoggerPlugin.m Tue Dec 29 13:44:29 2009 -0500
@@ -103,6 +103,16 @@
- (AIXMLAppender *)appenderForChat:(AIChat *)chat;
- (void)closeAppenderForChat:(AIChat *)chat;
- (void)finishClosingAppender:(NSString *)chatKey;
+
+- (void)showLogViewerForActiveChat:(id)sender;
+- (void)showLogNotification:(NSNotification *)inNotification;
+- (void)contentObjectAdded:(NSNotification *)notification;
+- (void)chatClosed:(NSNotification *)notification;
+- (void)chatOpened:(NSNotification *)notification;
+- (void)chatWillDelete:(NSNotification *)notification;
+- (void)showLogViewer:(id)sender;
+- (void)showLogViewerForGroupChat:(id)sender;
+- (void)_cleanDirtyLogsThread:(SKIndexRef)searchIndex;
@end
static NSString *logBasePath = nil; //The base directory of all logs
diff -r 5370572cdbaf -r c87cbb18aff2 Source/AINewBookmarkWindowController.m
--- a/Source/AINewBookmarkWindowController.m Tue Dec 29 01:27:50 2009 -0500
+++ b/Source/AINewBookmarkWindowController.m Tue Dec 29 13:44:29 2009 -0500
@@ -17,6 +17,9 @@
@interface AINewBookmarkWindowController ()
- (id)initWithWindowNibName:(NSString *)nibName forChat:(AIChat *)inChat notifyingTarget:(id)inTarget;
- (void)buildGroupMenu;
+- (void)newGroup:(id)sender;
+- (void)newGroupDidEnd:(NSNotification *)inNotification;
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
@end
@implementation AINewBookmarkWindowController
More information about the commits
mailing list