Merge pull request brotherbard#80 from Uncommon/url

Replace 10.7 API with 10.6 API
kelan · Jun 24, 2011 · 6cc2e26 · 6cc2e26
2 parents 3674dca + d0480c8
commit 6cc2e26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj
@@ -1618,7 +1618,6 @@
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = GitX;
-				SDKROOT = "";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
@@ -1646,7 +1645,6 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = "";
 				PRODUCT_NAME = GitX;
-				SDKROOT = "";
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
@@ -1665,7 +1663,7 @@
 				INFOPLIST_PREPROCESS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx10.6;
 			};
 			name = Debug;
 		};
@@ -1682,7 +1680,7 @@
 				INFOPLIST_PREPROCESS = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				SDKROOT = macosx10.6;
 			};
 			name = Release;
 		};

diff --git a/PBWebController.m b/PBWebController.m
@@ -37,9 +37,9 @@ - (void) awakeFromNib
 	[view setResourceLoadDelegate:self];
 
 	NSURL *resourceURL = [[[NSBundle mainBundle] resourceURL] URLByStandardizingPath];
-	NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views" isDirectory:YES] URLByAppendingPathComponent:startFile isDirectory:YES];
+	NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views"] URLByAppendingPathComponent:startFile];
 
-	NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html" isDirectory:NO];
+	NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html"];
 	[[view mainFrame] loadRequest:[NSURLRequest requestWithURL:fileURL]];
 }