diff options
| author | sqlprodev <sqlprodev@northofthree.com> | 2013-02-14 19:25:27 +0000 |
|---|---|---|
| committer | sqlprodev <sqlprodev@northofthree.com> | 2013-02-14 19:25:27 +0000 |
| commit | 47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9 (patch) | |
| tree | c135c5b21ece6bb5bd8f63d56f7e95fa9852abb4 /Source/SPConnectionControllerInitializer.m | |
| parent | c37936d71c9c8ad9b721e33899bb118032466896 (diff) | |
| download | sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.tar.gz sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.tar.bz2 sequelpro-47069472a4b5dc6655338a77ec8b1eb9a5f5c3d9.zip | |
Changes required to merge Sequel Pro r4011 into Coda
Diffstat (limited to 'Source/SPConnectionControllerInitializer.m')
| -rw-r--r-- | Source/SPConnectionControllerInitializer.m | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/SPConnectionControllerInitializer.m b/Source/SPConnectionControllerInitializer.m index 688b2016..66c39f2f 100644 --- a/Source/SPConnectionControllerInitializer.m +++ b/Source/SPConnectionControllerInitializer.m @@ -40,7 +40,9 @@ #import "SPDatabaseViewController.h" #import "SPSplitView.h" +#ifndef SP_REFACTOR static NSString *SPConnectionViewNibName = @"ConnectionView"; +#endif @interface SPConnectionController () @@ -152,6 +154,8 @@ static NSString *SPConnectionViewNibName = @"ConnectionView"; */ - (void)loadNib { +#ifndef SP_REFACTOR + // Load the connection nib, keeping references to the top-level objects for later release nibObjectsToRelease = [[NSMutableArray alloc] init]; @@ -161,6 +165,8 @@ static NSString *SPConnectionViewNibName = @"ConnectionView"; [nibLoader instantiateNibWithOwner:self topLevelObjects:&connectionViewTopLevelObjects]; [nibObjectsToRelease addObjectsFromArray:connectionViewTopLevelObjects]; [nibLoader release]; + +#endif } /** |