adium 2365:42fe60527948: Simplify, and avoid double-logging for ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/42fe60527948
revision:	2365:42fe60527948
author:		Zachary West <zacw at adium.im>
date:		Thu May 28 00:51:46 2009 -0400

Simplify, and avoid double-logging for the upload.

diffstat:

 Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (27 lines):

diff -r 2d88f2bca051 -r 42fe60527948 Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m
--- a/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m	Thu May 28 00:49:41 2009 -0400
+++ b/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m	Thu May 28 00:51:46 2009 -0400
@@ -186,9 +186,7 @@
 	
 	AIChat *chat = adium.interfaceController.activeChat;
 	NSImage *currentImage = [self currentImage];
-	
-	AILogWithSignature(@"Beginning upload for %@ to %@", currentImage, [uploader serviceName]);
-	
+
 	AILogWithSignature(@"Beginning upload for %@ to %@", currentImage, [uploader serviceName]);
 	
 	AIImageUploaderWindowController *controller = [AIImageUploaderWindowController displayProgressInWindow:[NSApp keyWindow]
@@ -288,10 +286,10 @@
  */
 - (void)cancelForChat:(AIChat *)chat
 {
-	[[uploadInstances objectForKey:chat.internalObjectID] cancel];
-	
 	AIImageUploaderWindowController *windowController = [windowControllers objectForKey:chat.internalObjectID];
 	NSObject <AIImageUploader> *imageUploader = [uploadInstances objectForKey:chat.internalObjectID];
+	
+	[imageUploader cancel];
 
 	[[windowController retain] autorelease];
 	[[imageUploader retain] autorelease];