adium-1.4 2926:d4de0ab97b8a: Fixed a missing } from a merge error

commits at adium.im commits at adium.im
Thu Apr 29 15:12:36 UTC 2010


details:	http://hg.adium.im/adium-1.4/rev/d4de0ab97b8a
revision:	2926:d4de0ab97b8a
author:		Evan Schoenberg
date:		Thu Apr 29 10:12:29 2010 -0500

Fixed a missing } from a merge error

diffs (36 lines):

diff -r acdf1d72ebcb -r d4de0ab97b8a Source/DCMessageContextDisplayPlugin.m
--- a/Source/DCMessageContextDisplayPlugin.m	Tue Apr 27 11:09:33 2010 -0500
+++ b/Source/DCMessageContextDisplayPlugin.m	Thu Apr 29 10:12:29 2010 -0500
@@ -277,7 +277,7 @@
 				
 				//Continue to parse as long as we need more elements, we have data to read, and LMX doesn't think we're done.
 			} while ([foundMessages count] < linesLeftToFind && offset > 0 && result != LMXParsedCompletely);
-
+			
 		} @catch (id theException) {
 			AILogWithSignature(@"Error \"%@\" while parsing %@; foundMessages at that point was %@, and the chunk to be parsed was %@",
 							   theException, logPath, 
@@ -285,19 +285,20 @@
 		} @finally {
 			//Drain our autorelease pool.
 			[parsingAutoreleasePool release];
-
+			
 			//Be a good citizen and close the file
 			[file closeFile];
-
+			
 			//Add our locals to the outer array; we're probably looping again.
 			[outerFoundContentContexts replaceObjectsInRange:NSMakeRange(0, 0) withObjectsFromArray:foundMessages];
 			linesLeftToFind -= [outerFoundContentContexts count];
 		}
+	}
 
 	if (linesLeftToFind > 0) {
 		AILogWithSignature(@"Unable to find %d logs for %@", linesLeftToFind, chat);
 	}
-	
+
 	return outerFoundContentContexts;
 }
 




More information about the commits mailing list