X-Git-Url: http://git.ithinksw.org/MenuTunes.git/blobdiff_plain/0204d8a09b6f8fba377e6f856d78a50a36fa3010..4e6cb99bd1806a37a1067e130a6c8fc5e5cedfb6:/NetworkController.m diff --git a/NetworkController.m b/NetworkController.m index 4204cbb..7c2e209 100755 --- a/NetworkController.m +++ b/NetworkController.m @@ -141,7 +141,7 @@ static NetworkController *sharedController; clientPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT host:host]; clientConnection = [[NSConnection connectionWithReceivePort:nil sendPort:clientPort] retain]; - [clientConnection setReplyTimeout:5]; + [clientConnection setReplyTimeout:10]; clientProxy = [[clientConnection rootProxy] retain]; connectedToServer = YES; NS_HANDLER @@ -219,8 +219,8 @@ static NetworkController *sharedController; testPort = [[NSSocketPort alloc] initRemoteWithTCPPort:SERVER_PORT host:host]; testConnection = [[NSConnection connectionWithReceivePort:nil sendPort:testPort] retain]; - [testConnection setReplyTimeout:2]; - [testConnection setRequestTimeout:2]; + [testConnection setReplyTimeout:5]; + [testConnection setRequestTimeout:5]; tempProxy = (NetworkObject *)[testConnection rootProxy]; [tempProxy serverName]; valid = [tempProxy isValid]; @@ -289,7 +289,12 @@ static NetworkController *sharedController; ITDebugLog(@"Found service named %@.", [aNetService name]); [remoteServices addObject:aNetService]; [aNetService setDelegate:self]; - [aNetService resolve]; + //Figure out if it responds to the 10.4 method + if ([aNetService respondsToSelector:@selector(resolveWithTimeout:)]) { + (void)[aNetService resolveWithTimeout:5.0]; + } else { + [aNetService resolve]; + } if (!moreComing) { [[NSNotificationCenter defaultCenter] postNotificationName:@"ITMTFoundNetService" object:nil]; }