adium-1.4 2674:4d6e6d868870: Fix the logic a tad here; we need t...

commits at adium.im commits at adium.im
Thu Oct 29 00:38:42 UTC 2009


details:	http://hg.adium.im/adium-1.4/rev/4d6e6d868870
revision:	2674:4d6e6d868870
author:		Zachary West <zacw at adium.im>
date:		Wed Oct 28 20:35:26 2009 -0400

Fix the logic a tad here; we need to commit a trimmed string in all cases, not just where AM/PM is not shown.

diffs (25 lines):

diff -r bc795bf3add5 -r 4d6e6d868870 Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m	Wed Oct 28 16:46:55 2009 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIDateFormatterAdditions.m	Wed Oct 28 20:35:26 2009 -0400
@@ -171,15 +171,16 @@
 									  options:NSBackwardsSearch | NSLiteralSearch
 										range:NSMakeRange(0,[newFormat length])];
 		
-		formatString = [newFormat stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
-		[newFormat release];
-		
-		if (setFormat)
-			[*cachePointer setDateFormat:formatString];
+		formatString = [newFormat autorelease];
 	} else {
 		formatString = [*cachePointer dateFormat];
 	}
 	
+	formatString = [formatString stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+	
+	if (setFormat)
+		[*cachePointer setDateFormat:formatString];
+	
 	return formatString;
 }
 




More information about the commits mailing list