diff --git a/AppController.m b/AppController.m index 2dc1eee8..a9e6d3ac 100644 --- a/AppController.m +++ b/AppController.m @@ -2949,8 +2949,13 @@ - (void)loadProxyInBackgroundForSelector:(SEL)selector withObject:(id)object onT } else if ([proxyOption isEqualToString:@"Provided"]) { + NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys:[NSValue valueWithPointer:selector],@"selector",target,@"target", nil]; + if (object){ + [userInfo addEntriesFromDictionary:@{@"object": object}]; + } + ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:[NSURL URLWithString:@"http://tom-tech.com/get_iplayer/proxy.txt"]]; - [request setUserInfo:@{@"selector": [NSValue valueWithPointer:selector], @"object": object}]; + [request setUserInfo:userInfo]; [request setDelegate:self]; [request setDidFailSelector:@selector(providedProxyDidFinish:)]; [request setDidFinishSelector:@selector(providedProxyDidFinish:)]; diff --git a/Get_iPlayer GUI.xcodeproj/project.pbxproj b/Get_iPlayer GUI.xcodeproj/project.pbxproj index 347b496e..a7563d42 100644 --- a/Get_iPlayer GUI.xcodeproj/project.pbxproj +++ b/Get_iPlayer GUI.xcodeproj/project.pbxproj @@ -586,6 +586,7 @@ buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Get iPlayer Automator" */; buildPhases = ( D9CCF443102349ED009205BE /* Copy Frameworks */, + D94BB4FE19689C5C008272DD /* ShellScript */, 8D1107290486CEB800E47090 /* Resources */, 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, @@ -683,6 +684,22 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + D94BB4FE19689C5C008272DD /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "LOCATION=\"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\nIDENTITY=\"Developer ID Application: Thomas Willson\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A\""; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 8D11072C0486CEB800E47090 /* Sources */ = { isa = PBXSourcesBuildPhase; diff --git a/Get_iPlayer GUI.xcodeproj/project.xcworkspace/xcuserdata/thomaswillson.xcuserdatad/UserInterfaceState.xcuserstate b/Get_iPlayer GUI.xcodeproj/project.xcworkspace/xcuserdata/thomaswillson.xcuserdatad/UserInterfaceState.xcuserstate index 737f84db..383856c3 100644 Binary files a/Get_iPlayer GUI.xcodeproj/project.xcworkspace/xcuserdata/thomaswillson.xcuserdatad/UserInterfaceState.xcuserstate and b/Get_iPlayer GUI.xcodeproj/project.xcworkspace/xcuserdata/thomaswillson.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Info.plist b/Info.plist index 1d9f91db..e4a6e01e 100644 --- a/Info.plist +++ b/Info.plist @@ -19,9 +19,9 @@ CFBundleSignature ???? CFBundleVersion - 696 + 699 CFBundleShortVersionString - 1.7 + 1.7.1 NSMainNibFile MainMenu NSPrincipalClass diff --git a/Programme.m b/Programme.m index dd8ba68f..3dbc53ef 100644 --- a/Programme.m +++ b/Programme.m @@ -185,7 +185,7 @@ -(void)proxyRetrievalFinished:(id)sender proxyError:(NSError *)proxyError @"-i", [NSString stringWithFormat:@"--profile-dir=%@",[@"~/Library/Application Support/Get iPlayer Automator/" stringByExpandingTildeInPath]],pid]]; if ([AppController sharedController].proxy) { - [args addObject:[AppController sharedController].proxy.url]; + [args addObject:[NSString stringWithFormat:@"-p%@",[AppController sharedController].proxy.url]]; if (![[[NSUserDefaults standardUserDefaults] valueForKey:@"AlwaysUseProxy"] boolValue]) {