adium 3397:a3cebb3ee233: Serverside autoreplies should not be co...

commits at adium.im commits at adium.im
Fri Oct 22 17:47:15 UTC 2010


details:	http://hg.adium.im/adium/rev/a3cebb3ee233
revision:	3397:a3cebb3ee233
author:		mathuaerknedam
date:		Fri Oct 22 12:44:17 2010 -0500

Serverside autoreplies should not be consecutivized. Fixes #14401.
(transplanted from 75ab4a061901612e9d149133b9aa3351fd6267ca)

diffs (13 lines):

diff -r 4b98241d8ea1 -r a3cebb3ee233 Frameworks/Adium Framework/Source/AIContentObject.m
--- a/Frameworks/Adium Framework/Source/AIContentObject.m	Wed Oct 20 21:22:33 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIContentObject.m	Fri Oct 22 12:44:17 2010 -0500
@@ -113,7 +113,8 @@
 	if (
 			source == [inContent source] && 
 			[[self type] compare:[inContent type]] == NSOrderedSame &&
-			[[self displayClasses] containsObject:@"mention"] == [[inContent displayClasses] containsObject:@"mention"]
+			[[self displayClasses] containsObject:@"mention"] == [[inContent displayClasses] containsObject:@"mention"] &&
+			[[self displayClasses] containsObject:@"autoreply"] == [[inContent displayClasses] containsObject:@"autoreply"]
 	) {
 		NSTimeInterval	timeInterval = [date timeIntervalSinceDate:[inContent date]];
 		



More information about the commits mailing list