Skip to content

Commit 6cc2e26

Browse files
committed
Merge pull request brotherbard#80 from Uncommon/url
Replace 10.7 API with 10.6 API
2 parents 3674dca + d0480c8 commit 6cc2e26

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

GitX.xcodeproj/project.pbxproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -1618,7 +1618,6 @@
16181618
LIBRARY_SEARCH_PATHS = "";
16191619
ONLY_ACTIVE_ARCH = YES;
16201620
PRODUCT_NAME = GitX;
1621-
SDKROOT = "";
16221621
WRAPPER_EXTENSION = app;
16231622
ZERO_LINK = YES;
16241623
};
@@ -1646,7 +1645,6 @@
16461645
INSTALL_PATH = "$(HOME)/Applications";
16471646
LIBRARY_SEARCH_PATHS = "";
16481647
PRODUCT_NAME = GitX;
1649-
SDKROOT = "";
16501648
WRAPPER_EXTENSION = app;
16511649
};
16521650
name = Release;
@@ -1665,7 +1663,7 @@
16651663
INFOPLIST_PREPROCESS = YES;
16661664
MACOSX_DEPLOYMENT_TARGET = 10.5;
16671665
PREBINDING = NO;
1668-
SDKROOT = macosx10.5;
1666+
SDKROOT = macosx10.6;
16691667
};
16701668
name = Debug;
16711669
};
@@ -1682,7 +1680,7 @@
16821680
INFOPLIST_PREPROCESS = YES;
16831681
MACOSX_DEPLOYMENT_TARGET = 10.5;
16841682
PREBINDING = NO;
1685-
SDKROOT = macosx10.5;
1683+
SDKROOT = macosx10.6;
16861684
};
16871685
name = Release;
16881686
};

PBWebController.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ - (void) awakeFromNib
3737
[view setResourceLoadDelegate:self];
3838

3939
NSURL *resourceURL = [[[NSBundle mainBundle] resourceURL] URLByStandardizingPath];
40-
NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views" isDirectory:YES] URLByAppendingPathComponent:startFile isDirectory:YES];
40+
NSURL *baseURL = [[resourceURL URLByAppendingPathComponent:@"html/views"] URLByAppendingPathComponent:startFile];
4141

42-
NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html" isDirectory:NO];
42+
NSURL *fileURL = [baseURL URLByAppendingPathComponent:@"index.html"];
4343
[[view mainFrame] loadRequest:[NSURLRequest requestWithURL:fileURL]];
4444
}
4545

0 commit comments

Comments
 (0)