adium 3102:d82851948e10: x86_64 builds should not be linking aga...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/d82851948e10
revision:	3102:d82851948e10
author:		Stephen Holt <sholt at adium.im>
date:		Wed Feb 03 16:36:53 2010 -0500

x86_64 builds should not be linking against QuickTime.framework.  Update the Adium.xcconfg to fix this linker warning.
Subject: adium 3103:48e7afaa1ce5: Initialize to nil here and silence a warning.

details:	http://hg.adium.im/adium/rev/48e7afaa1ce5
revision:	3103:48e7afaa1ce5
author:		Stephen Holt <sholt at adium.im>
date:		Wed Feb 03 16:37:07 2010 -0500

Initialize to nil here and silence a warning.

diffs (41 lines):

diff -r 5eada67609ee -r 48e7afaa1ce5 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Wed Feb 03 13:05:37 2010 -0500
+++ b/Adium.xcodeproj/project.pbxproj	Wed Feb 03 16:37:07 2010 -0500
@@ -693,7 +693,6 @@
 		34C6CFAB0DF4B41300651F70 /* RBSplitView.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 34D1AB5C0D693DEB00470520 /* RBSplitView.framework */; };
 		34C7C62809EC4E890060FB4A /* AILibpurplePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B3244309BA003C00029361 /* AILibpurplePlugin.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34C846AF101E515900140B4B /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34C846AE101E515900140B4B /* QTKit.framework */; };
-		34C846E6101E518F00140B4B /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34C846E5101E518F00140B4B /* QuickTime.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		34C899AC07E51B18009357F6 /* BuiltInEventPresets.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34C899AB07E51B18009357F6 /* BuiltInEventPresets.plist */; };
 		34C91BBB0CA8909700740974 /* AIContentNotification.h in Headers */ = {isa = PBXBuildFile; fileRef = 34C91BB90CA8909700740974 /* AIContentNotification.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		34C91BBC0CA8909700740974 /* AIContentNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 34C91BBA0CA8909700740974 /* AIContentNotification.m */; };
@@ -4870,7 +4869,6 @@
 				11879DF80F6FFC0B00CACFB1 /* OAuthConsumer.framework in Frameworks */,
 				118A44510FEEA828008153C0 /* libjson-glib.framework in Frameworks */,
 				34C846AF101E515900140B4B /* QTKit.framework in Frameworks */,
-				34C846E6101E518F00140B4B /* QuickTime.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff -r 5eada67609ee -r 48e7afaa1ce5 Source/ESAccountEvents.m
--- a/Source/ESAccountEvents.m	Wed Feb 03 13:05:37 2010 -0500
+++ b/Source/ESAccountEvents.m	Wed Feb 03 16:37:07 2010 -0500
@@ -187,7 +187,7 @@
 									forChat:(AIChat *)chat
 								  withCount:(NSUInteger)count
 {
-	NSString *format;
+	NSString *format = nil;
 	
 	if ([eventID isEqualToString:ACCOUNT_CONNECTED]) {
 		format = AILocalizedString(@"%u accounts connected",nil);
diff -r 5eada67609ee -r 48e7afaa1ce5 xcconfigs/Adium.xcconfig
--- a/xcconfigs/Adium.xcconfig	Wed Feb 03 13:05:37 2010 -0500
+++ b/xcconfigs/Adium.xcconfig	Wed Feb 03 16:37:07 2010 -0500
@@ -11,3 +11,6 @@
 LD_RUNPATH_SEARCH_PATHS = @executable_path/../Frameworks
 HEADER_SEARCH_PATHS = $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_1) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_2) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_3) $(HEADER_SEARCH_PATHS_QUOTED_FOR_TARGET_4)
 OTHER_CFLAGS = $(CFLAGS) -fno-builtin-strndup
+OTHER_LDFLAGS[arch=ppc] = -framework QuickTime
+OTHER_LDFLAGS[arch=i386] = -framework QuickTime
+OTHER_LDFLAGS[arch=x86_64] = -framework QTKit