adium 3082:6c3218861f46: Define this if we're building 32 like 6...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/6c3218861f46
revision:	3082:6c3218861f46
author:		Stephen Holt <sholt at adium.im>
date:		Mon Dec 28 18:18:57 2009 -0500

Define this if we're building 32 like 64 as well.
Subject: adium 3083:9d27f1cb5c30: Resolve warnings in Spotlight Importer.

details:	http://hg.adium.im/adium/rev/9d27f1cb5c30
revision:	3083:9d27f1cb5c30
author:		Stephen Holt <sholt at adium.im>
date:		Mon Dec 28 18:30:29 2009 -0500

Resolve warnings in Spotlight Importer.
Subject: adium 3084:647f5ba1fd8c: Add -fno-builtin-strndup to the spotlight importer xcconfig.  OS X doesn't include this lib, but gcc still thinks it's defined anyway.

details:	http://hg.adium.im/adium/rev/647f5ba1fd8c
revision:	3084:647f5ba1fd8c
author:		Stephen Holt <sholt at adium.im>
date:		Mon Dec 28 19:31:21 2009 -0500

Add -fno-builtin-strndup to the spotlight importer xcconfig.  OS X doesn't include this lib, but gcc still thinks it's defined anyway.
Subject: adium 3085:fafab246e257: Silence AppleScript runner warnings.

details:	http://hg.adium.im/adium/rev/fafab246e257
revision:	3085:fafab246e257
author:		Stephen Holt <sholt at adium.im>
date:		Mon Dec 28 19:46:02 2009 -0500

Silence AppleScript runner warnings.

diffs (81 lines):

diff -r 6388b2768ef1 -r fafab246e257 Frameworks/AIUtilities Framework/Source/AIMathCompatibility.h
--- a/Frameworks/AIUtilities Framework/Source/AIMathCompatibility.h	Mon Dec 28 16:48:49 2009 -0500
+++ b/Frameworks/AIUtilities Framework/Source/AIMathCompatibility.h	Mon Dec 28 19:46:02 2009 -0500
@@ -8,9 +8,9 @@
  */
 
 #ifndef AIMathCompatibility
-#define AIMathCompatibility
+#define AIMathCompatibility 1
 
-#ifdef __LP64__
+#if __LP64__ || NS_BUILD_32_LIKE_64
 	#define AIfabs( X )			fabs((X))
 	#define AIround( X )		round((X))
 	#define AIceil( X )			ceil((X))
diff -r 6388b2768ef1 -r fafab246e257 Other/Adium Spotlight Importer/GetMetadataForHTMLLog-Additions.m
--- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog-Additions.m	Mon Dec 28 16:48:49 2009 -0500
+++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog-Additions.m	Mon Dec 28 19:46:02 2009 -0500
@@ -29,7 +29,7 @@
 	
 	NSString *string = [self string];
 	NSRange range = NSMakeRange([self scanLocation], 0);
-	register unsigned length = [string length] - range.location; //register because it is used in the loop below.
+	register NSUInteger length = [string length] - range.location; //register because it is used in the loop below.
 	range.length = length;
 	
 	unichar *buf = malloc(length * sizeof(unichar));
@@ -83,7 +83,7 @@
 			BOOL	handled = NO;
 			
 			if ([[error domain] isEqualToString:NSCocoaErrorDomain]) {
-				int		errorCode = [error code];
+				NSInteger		errorCode = [error code];
 				
 				//XXX - I'm sure these constants are defined somewhere, but I can't find them. -eds
 				if (errorCode == 260) {
@@ -170,7 +170,7 @@
 				nil];
 		}
 		
-		unsigned len = [self length];
+		NSUInteger len = [self length];
 		NSMutableString *result = [NSMutableString stringWithCapacity:len];
 		NSScanner *scanner = [NSScanner scannerWithString:self];
 		[scanner setCharactersToBeSkipped:[NSCharacterSet characterSetWithRange:(NSRange){ 0, 0 }]];
diff -r 6388b2768ef1 -r fafab246e257 Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m
--- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m	Mon Dec 28 16:48:49 2009 -0500
+++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m	Mon Dec 28 19:46:02 2009 -0500
@@ -141,7 +141,7 @@
 	* or HTML log is stored as ServiceID.Account_Name/Destination_Name/Destination_Name (2006-03-30).AdiumHTMLLog
 	*/
 	NSArray *pathComponents = [pathToFile pathComponents];
-	unsigned count = [pathComponents count];
+	NSUInteger count = [pathComponents count];
 	NSString *toUID = ((count >= 2) ? [pathComponents objectAtIndex:(count - 2)] : nil);
 	NSString *sourceFolder = ((count >= 3) ? [pathComponents objectAtIndex:(count - 3)] : nil);
 	NSString *serviceClass, *fromUID;
diff -r 6388b2768ef1 -r fafab246e257 Source/ApplescriptRunner.m
--- a/Source/ApplescriptRunner.m	Mon Dec 28 16:48:49 2009 -0500
+++ b/Source/ApplescriptRunner.m	Mon Dec 28 19:46:02 2009 -0500
@@ -17,6 +17,12 @@
 - (void)resetAutomaticQuitTimer;
 @end
 
+ at interface AIApplescriptRunner ()
+- (void)respondIfReady:(NSNotification *)inNotification;
+- (void)executeScript:(NSNotification *)inNotification;
+- (void)quit:(NSNotification *)inNotification;
+ at end
+
 @implementation AIApplescriptRunner
 - (id)init
 {
diff -r 6388b2768ef1 -r fafab246e257 xcconfigs/Spotlight Importer.xcconfig
--- a/xcconfigs/Spotlight Importer.xcconfig	Mon Dec 28 16:48:49 2009 -0500
+++ b/xcconfigs/Spotlight Importer.xcconfig	Mon Dec 28 19:46:02 2009 -0500
@@ -6,3 +6,4 @@
 GCC_GENERATE_DEBUGGING_SYMBOLS = NO
 INSTALL_PATH = /Library/Spotlight
 LIBRARY_STYLE = bundle
+OTHER_CFLAGS = ${OTHER_CFLAGS} -fno-builtin-strndup