adium 3745:7bb578389a34: backing out 4df726a9f736
commits at adium.im
commits at adium.im
Tue Mar 15 05:23:28 UTC 2011
details: http://hg.adium.im/adium/rev/7bb578389a34
revision: 3745:7bb578389a34
branch: (none)
author: Stephen Holt <sholt at adium.im>
date: Mon Mar 14 22:22:31 2011 -0700
backing out 4df726a9f736
Subject: adium 3746:c968a6182d7a: backing out 50f806e9a900
details: http://hg.adium.im/adium/rev/c968a6182d7a
revision: 3746:c968a6182d7a
branch: (none)
author: Stephen Holt <sholt at adium.im>
date: Mon Mar 14 22:22:59 2011 -0700
backing out 50f806e9a900
Subject: adium 3747:1204c1caee52: backing out 0054af11643b
details: http://hg.adium.im/adium/rev/1204c1caee52
revision: 3747:1204c1caee52
branch: (none)
author: Stephen Holt <sholt at adium.im>
date: Mon Mar 14 22:23:23 2011 -0700
backing out 0054af11643b
diffs (245 lines):
diff -r f38f52ba56c3 -r 1204c1caee52 .hgignore
--- a/.hgignore Mon Mar 14 22:20:38 2011 -0700
+++ b/.hgignore Mon Mar 14 22:23:23 2011 -0700
@@ -8,10 +8,6 @@
build
Icon*
Docs
-
-*/xcuserdata
-*.xcworkspacedata
-
Dependencies/build
Dependencies/source
Dependencies/Frameworks
diff -r f38f52ba56c3 -r 1204c1caee52 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Mon Mar 14 22:20:38 2011 -0700
+++ b/Adium.xcodeproj/project.pbxproj Mon Mar 14 22:23:23 2011 -0700
@@ -12759,9 +12759,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02A0FAF9BA800B310AC /* Debug.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- SDKROOT = macosx10.7;
};
name = Debug;
};
@@ -12769,9 +12766,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02B0FAF9BA800B310AC /* Release.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- SDKROOT = macosx10.7;
};
name = Release;
};
@@ -12779,9 +12773,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02C0FAF9BA800B310AC /* Release-Debug.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- SDKROOT = macosx10.7;
};
name = "Release-Debug";
};
diff -r f38f52ba56c3 -r 1204c1caee52 Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Mon Mar 14 22:20:38 2011 -0700
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj Mon Mar 14 22:23:23 2011 -0700
@@ -401,11 +401,7 @@
};
buildConfigurationList = DA8A8087085549EE00F24BB3 /* Build configuration list for PBXProject "AutoHyperlinks.framework" */;
compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
hasScannedForEncodings = 1;
- knownRegions = (
- en,
- );
mainGroup = 0867D691FE84028FC02AAC07 /* AIHyperlinks.framework */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
@@ -630,9 +626,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7E0CF31B11769FE700EDC305 /* Release-Debug.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- SDKROOT = macosx10.7;
};
name = "Release-Debug";
};
@@ -908,9 +901,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7E0CF30C11769F4C00EDC305 /* Debug.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- SDKROOT = macosx10.7;
};
name = Debug;
};
@@ -918,9 +908,6 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 7E0CF31811769FBD00EDC305 /* Release.xcconfig */;
buildSettings = {
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
- SDKROOT = macosx10.7;
};
name = Release;
};
diff -r f38f52ba56c3 -r 1204c1caee52 Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj
--- a/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Mon Mar 14 22:20:38 2011 -0700
+++ b/Frameworks/FriBidi Framework/FriBidi.xcodeproj/project.pbxproj Mon Mar 14 22:23:23 2011 -0700
@@ -302,11 +302,7 @@
};
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "FriBidi" */;
compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
hasScannedForEncodings = 1;
- knownRegions = (
- en,
- );
mainGroup = 0867D691FE84028FC02AAC07 /* FriBidi */;
productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
projectDirPath = "";
@@ -397,10 +393,9 @@
buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ GCC_VERSION = 4.2;
ONLY_ACTIVE_ARCH = YES;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.5;
SYMROOT = ../../build;
VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
};
@@ -416,11 +411,10 @@
ppc,
);
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = 4.2;
INFOPLIST_OUTPUT_FORMAT = binary;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
PLIST_FILE_OUTPUT_FORMAT = binary;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.5;
SYMROOT = ../../build;
};
name = Release;
@@ -435,11 +429,10 @@
ppc,
);
GCC_PREPROCESSOR_DEFINITIONS = HAVE_CONFIG_H;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = 4.2;
INFOPLIST_OUTPUT_FORMAT = binary;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
PLIST_FILE_OUTPUT_FORMAT = binary;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.5;
SYMROOT = ../../build;
};
name = "Release-Debug";
diff -r f38f52ba56c3 -r 1204c1caee52 Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj
--- a/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Mon Mar 14 22:20:38 2011 -0700
+++ b/Frameworks/RBSplitView/RBSplitView.xcodeproj/project.pbxproj Mon Mar 14 22:23:23 2011 -0700
@@ -392,11 +392,7 @@
};
buildConfigurationList = D50F206F08A01A630073A261 /* Build configuration list for PBXProject "RBSplitView" */;
compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
hasScannedForEncodings = 1;
- knownRegions = (
- en,
- );
mainGroup = 0259C574FE90428111CA0C5A /* RBSplitView */;
projectDirPath = "";
projectRoot = "";
@@ -585,12 +581,11 @@
APPLY_RULES_IN_COPY_FILES = YES;
CURRENT_PROJECT_VERSION = 1.1.4;
GCC_PREFIX_HEADER = Source/RBSplitView_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ GCC_VERSION = 4.2;
INFOPLIST_OUTPUT_FORMAT = binary;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
PLIST_FILE_OUTPUT_FORMAT = binary;
PRODUCT_NAME = RBSplitView;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.5;
SYMROOT = ../../build;
};
name = "Release-Debug";
@@ -770,11 +765,10 @@
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
CURRENT_PROJECT_VERSION = 1.1.4;
GCC_PREFIX_HEADER = Source/RBSplitView_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ GCC_VERSION = 4.2;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_NAME = RBSplitView;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.5;
SYMROOT = ../../build;
};
name = Debug;
@@ -786,10 +780,9 @@
APPLY_RULES_IN_COPY_FILES = YES;
CURRENT_PROJECT_VERSION = 1.1.4;
GCC_PREFIX_HEADER = Source/RBSplitView_Prefix.pch;
- GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
- MACOSX_DEPLOYMENT_TARGET = 10.6;
+ GCC_VERSION = 4.2;
PRODUCT_NAME = RBSplitView;
- SDKROOT = macosx10.7;
+ SDKROOT = macosx10.5;
SYMROOT = ../../build;
};
name = Release;
diff -r f38f52ba56c3 -r 1204c1caee52 Frameworks/RBSplitView/Source/RBSplitView.m
--- a/Frameworks/RBSplitView/Source/RBSplitView.m Mon Mar 14 22:20:38 2011 -0700
+++ b/Frameworks/RBSplitView/Source/RBSplitView.m Mon Mar 14 22:23:23 2011 -0700
@@ -31,7 +31,7 @@
// These class methods get and set the cursor used for each type.
// Pass in nil to reset to the default cursor for that type.
+ (NSCursor*)cursor:(RBSVCursorType)type {
- if (type<RBSVCursorTypeCount) {
+ if ((type>=0)&&(type<RBSVCursorTypeCount)) {
NSCursor* result = cursors[type];
if (result) {
return result;
@@ -53,7 +53,7 @@
}
+ (void)setCursor:(RBSVCursorType)type toCursor:(NSCursor*)cursor {
- if (type<RBSVCursorTypeCount) {
+ if ((type>=0)&&(type<RBSVCursorTypeCount)) {
[cursors[type] release];
cursors[type] = [cursor retain];
}
diff -r f38f52ba56c3 -r 1204c1caee52 Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m
--- a/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Mon Mar 14 22:20:38 2011 -0700
+++ b/Other/Adium Spotlight Importer/GetMetadataForHTMLLog.m Mon Mar 14 22:23:23 2011 -0700
@@ -160,7 +160,6 @@
/* Find the length of STRING, but scan at most MAXLEN characters.
If no '\0' terminator is found in that many characters, return MAXLEN. */
-#if MAC_OS_X_VERSION_10_6 > MAC_OS_X_VERSION_MAX_ALLOWED
static size_t
strnlen (const char *string, size_t maxlen)
{
@@ -179,7 +178,6 @@
nouveau[len] = '\0';
return (char *) memcpy (nouveau, s, len);
}
-#endif
static char *gaim_unescape_html(const char *html) {
NSString *unescapedString = [[NSString stringWithUTF8String:html] stringByUnescapingFromXMLWithEntities:nil];
More information about the commits
mailing list