adium 5377:a9f4102abb03: Backed out a4f689d8f3a4:

commits at adium.im commits at adium.im
Thu Mar 7 12:22:48 UTC 2013


details:	http://hg.adium.im/adium/rev/a9f4102abb03
revision:	5377:a9f4102abb03
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Thu Mar 07 13:20:35 2013 +0100

Backed out a4f689d8f3a4:

* The xcodeproj changes should be in the xcconfig files.
* The other changes crash on 10.7.5.

Refs #16337

diffs (54 lines):

diff -r ca5229914ebc -r a9f4102abb03 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj	Tue Mar 05 12:43:30 2013 +0100
+++ b/Adium.xcodeproj/project.pbxproj	Thu Mar 07 13:20:35 2013 +0100
@@ -12550,8 +12550,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 63C7E02A0FAF9BA800B310AC /* Debug.xcconfig */;
 			buildSettings = {
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7.5;
 			};
 			name = Debug;
 		};
@@ -12559,8 +12557,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 63C7E02B0FAF9BA800B310AC /* Release.xcconfig */;
 			buildSettings = {
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7.5;
 			};
 			name = Release;
 		};
@@ -12568,8 +12564,6 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 63C7E02C0FAF9BA800B310AC /* Release-Debug.xcconfig */;
 			buildSettings = {
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7.5;
 			};
 			name = "Release-Debug";
 		};
diff -r ca5229914ebc -r a9f4102abb03 Plugins/Purple Service/adiumPurpleEventloop.m
--- a/Plugins/Purple Service/adiumPurpleEventloop.m	Tue Mar 05 12:43:30 2013 +0100
+++ b/Plugins/Purple Service/adiumPurpleEventloop.m	Thu Mar 07 13:20:35 2013 +0100
@@ -69,10 +69,10 @@
 }
 
 static inline dispatch_source_t sourceForTag(guint tag) {
-    return (__bridge dispatch_source_t)([sourceInfoDict() objectForKey:@(tag)]);
+    return [sourceInfoDict() objectForKey:@(tag)];
 }
 static inline void setSourceForTag(dispatch_source_t source, guint tag) {
-	[sourceInfoDict() setObject:(__bridge id)(source) forKey:@(tag)];
+	[sourceInfoDict() setObject:source forKey:@(tag)];
 }
 static inline void removeSourceForTag(guint tag) {
 	[sourceInfoDict() removeObjectForKey:@(tag)];
diff -r ca5229914ebc -r a9f4102abb03 xcconfigs/Base.xcconfig
--- a/xcconfigs/Base.xcconfig	Tue Mar 05 12:43:30 2013 +0100
+++ b/xcconfigs/Base.xcconfig	Thu Mar 07 13:20:35 2013 +0100
@@ -45,3 +45,4 @@
 CLANG_WARN_CONSTANT_CONVERSION = YES
 CLANG_WARN_INT_CONVERSION = YES
 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_ENUM_CONVERSION = YES




More information about the commits mailing list