adium 3707:719b4769da08: There is no need for this wrapper.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/719b4769da08
revision:	3707:719b4769da08
author:		Frank Dowsett <wixardy at adium.im>
date:		Fri Mar 04 13:10:58 2011 -0500

There is no need for this wrapper.

diffs (51 lines):

diff -r 7cd4fb521300 -r 719b4769da08 Frameworks/Adium Framework/Source/AIContentControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIContentControllerProtocol.h	Mon Feb 28 17:49:25 2011 -0800
+++ b/Frameworks/Adium Framework/Source/AIContentControllerProtocol.h	Fri Mar 04 13:10:58 2011 -0500
@@ -104,7 +104,6 @@
 					   content:(AIContentObject*)content;
 
 	//Sending / Receiving content
-- (BOOL)availableForSendingContentType:(NSString *)inType toContact:(AIListContact *)inContact onAccount:(AIAccount *)inAccount;
 - (void)receiveContentObject:(AIContentObject *)inObject;
 - (BOOL)sendContentObject:(AIContentObject *)inObject;
 - (void)sendRawMessage:(NSString *)inString toContact:(AIListContact *)inContact;
diff -r 7cd4fb521300 -r 719b4769da08 Plugins/Send Message Contact Alert/ESSendMessageContactAlertPlugin.m
--- a/Plugins/Send Message Contact Alert/ESSendMessageContactAlertPlugin.m	Mon Feb 28 17:49:25 2011 -0800
+++ b/Plugins/Send Message Contact Alert/ESSendMessageContactAlertPlugin.m	Fri Mar 04 13:10:58 2011 -0500
@@ -123,9 +123,8 @@
 	}
 	
 	//If the desired account is not available for sending, ask Adium for the best available account
-	if (![adium.contentController availableForSendingContentType:CONTENT_MESSAGE_TYPE
-														toContact:contact
-														onAccount:account]) {
+	if (![account availableForSendingContentType:CONTENT_MESSAGE_TYPE
+									   toContact:contact]) {
 		if (useAnotherAccount) {
 			account = [adium.accountController preferredAccountForSendingContentType:CONTENT_MESSAGE_TYPE
 																			 toContact:contact];
diff -r 7cd4fb521300 -r 719b4769da08 Source/AIContentController.m
--- a/Source/AIContentController.m	Mon Feb 28 17:49:25 2011 -0800
+++ b/Source/AIContentController.m	Fri Mar 04 13:10:58 2011 -0500
@@ -588,7 +588,7 @@
 	if (!inContentMessage.destination ||
 		![inContentMessage.destination isKindOfClass:[AIListContact class]] ||
 		![inContentMessage.chat.account availableForSendingContentType:CONTENT_FILE_TRANSFER_TYPE
-																 toContact:(AIListContact *)inContentMessage.destination]) {
+															 toContact:(AIListContact *)inContentMessage.destination]) {
 		//Simply return if we can't do anything about file sends for this message.
 		return;
 	}
@@ -838,12 +838,6 @@
 	[self receiveContentObject:content];
 }
 
-//Returns YES if the account/chat is available for sending content
-- (BOOL)availableForSendingContentType:(NSString *)inType toContact:(AIListContact *)inContact onAccount:(AIAccount *)inAccount 
-{
-	return [inAccount availableForSendingContentType:inType toContact:inContact];
-}
-
 /*! 
  * @brief Generate a menu of encryption preference choices
  */