adium-1.4 2669:aa2b8878166d: When replacing an emoticon in an at...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/aa2b8878166d
revision:	2669:aa2b8878166d
author:		Zachary West <zacw at adium.im>
date:		Wed Oct 28 13:50:22 2009 -0400

When replacing an emoticon in an attributed string, don't copy any previous attachments that string had into the replacement string. Fixes #12186.

diffs (19 lines):

diff -r 51b737ca9b65 -r aa2b8878166d Source/AIEmoticonController.m
--- a/Source/AIEmoticonController.m	Wed Oct 28 11:09:20 2009 -0400
+++ b/Source/AIEmoticonController.m	Wed Oct 28 13:50:22 2009 -0400
@@ -344,9 +344,13 @@
 			if (acceptable) {
 				replacement = [emoticon attributedStringWithTextEquivalent:replacementString attachImages:!isMessage];
 				
+				NSDictionary *originalAttributes = [originalAttributedString attributesAtIndex:originalEmoticonLocation
+																				effectiveRange:nil];
+				
+				originalAttributes = [originalAttributes dictionaryWithDifferenceWithSetOfKeys:[NSSet setWithObject:NSAttachmentAttributeName]];
+				
 				//grab the original attributes, to ensure that the background is not lost in a message consisting only of an emoticon
-				[replacement addAttributes:[originalAttributedString attributesAtIndex:originalEmoticonLocation
-																		effectiveRange:nil] 
+				[replacement addAttributes:originalAttributes
 									 range:NSMakeRange(0,1)];
 				
 				//insert the emoticon