adium 3044:f134ec38f60b: Move show from the controller to the me...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/f134ec38f60b
revision:	3044:f134ec38f60b
author:		Zachary West <zacw at adium.im>
date:		Thu Dec 10 02:32:25 2009 -0500

Move show from the controller to the media object.

diffs (50 lines):

diff -r cd0d54bfe668 -r f134ec38f60b Frameworks/Adium Framework/Source/AIMedia.h
--- a/Frameworks/Adium Framework/Source/AIMedia.h	Thu Dec 10 02:30:27 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIMedia.h	Thu Dec 10 02:32:25 2009 -0500
@@ -34,4 +34,6 @@
 + (AIMedia *)mediaWithContact:(AIListContact *)inListContact
 					onAccount:(AIAccount *)inAccount;
 
+- (void)show;
+
 @end
diff -r cd0d54bfe668 -r f134ec38f60b Frameworks/Adium Framework/Source/AIMedia.m
--- a/Frameworks/Adium Framework/Source/AIMedia.m	Thu Dec 10 02:30:27 2009 -0500
+++ b/Frameworks/Adium Framework/Source/AIMedia.m	Thu Dec 10 02:32:25 2009 -0500
@@ -53,4 +53,9 @@
 	[adium.mediaController media:self didSetState:inMediaState];
 }
 
+- (void)show
+{
+	
+}
+
 @end
diff -r cd0d54bfe668 -r f134ec38f60b Plugins/Purple Service/adiumPurpleMedia.m
--- a/Plugins/Purple Service/adiumPurpleMedia.m	Thu Dec 10 02:30:27 2009 -0500
+++ b/Plugins/Purple Service/adiumPurpleMedia.m	Thu Dec 10 02:32:25 2009 -0500
@@ -254,7 +254,7 @@
 	adiumMedia.protocolInfo = (id)media;
 	
 	if (purple_media_is_initiator(media, NULL, NULL) == TRUE) {
-		[adium.mediaController showMedia:adiumMedia];
+		[adiumMedia show];
 		
 		adiumMedia.mediaState = AIMediaStateWaiting;
 	} else {
diff -r cd0d54bfe668 -r f134ec38f60b Source/AIMediaController.m
--- a/Source/AIMediaController.m	Thu Dec 10 02:30:27 2009 -0500
+++ b/Source/AIMediaController.m	Thu Dec 10 02:32:25 2009 -0500
@@ -43,11 +43,6 @@
 	return nil;
 }
 
-- (void)showMedia:(AIMedia *)media
-{
-	
-}
-
 - (void)media:(AIMedia *)media didSetState:(AIMediaState)state
 {