1.1 --- a/Core/Source/GrowlPreferencePane.m Sat May 31 16:14:12 2008 +0000
1.2 +++ b/Core/Source/GrowlPreferencePane.m Mon Jul 28 21:53:02 2008 +0000
1.3 @@ -478,8 +478,7 @@
1.4 NSEnumerator *enumerator = [services objectEnumerator];
1.5 GrowlBrowserEntry *entry;
1.6 while ((entry = [enumerator nextObject]))
1.7 - if (![entry netService])
1.8 - [destinations addObject:[entry properties]];
1.9 + [destinations addObject:[entry properties]];
1.10 [preferencesController setObject:destinations forKey:GrowlForwardDestinationsKey];
1.11 [destinations release];
1.12 }
1.13 @@ -949,7 +948,7 @@
1.14 return;
1.15
1.16 // add a new entry at the end
1.17 - entry = [[GrowlBrowserEntry alloc] initWithComputerName:name netService:aNetService];
1.18 + entry = [[GrowlBrowserEntry alloc] initWithComputerName:name];
1.19 [self willChangeValueForKey:@"services"];
1.20 [services addObject:entry];
1.21 [self didChangeValueForKey:@"services"];
1.22 @@ -972,52 +971,14 @@
1.23 }
1.24 }
1.25
1.26 - if (serviceBeingResolved && [serviceBeingResolved isEqual:aNetService]) {
1.27 - [serviceBeingResolved stop];
1.28 - [serviceBeingResolved release];
1.29 - serviceBeingResolved = nil;
1.30 - }
1.31 -
1.32 if (!moreComing)
1.33 [self writeForwardDestinations];
1.34 }
1.35
1.36 -- (void) netServiceDidResolveAddress:(NSNetService *)sender {
1.37 - NSArray *addresses = [sender addresses];
1.38 - if ([addresses count] > 0U) {
1.39 - NSData *address = [addresses objectAtIndex:0U];
1.40 - GrowlBrowserEntry *entry = [services objectAtIndex:currentServiceIndex];
1.41 - [entry setAddress:address];
1.42 - [self writeForwardDestinations];
1.43 - }
1.44 -}
1.45 -
1.46 #pragma mark Bonjour
1.47
1.48 - (void) resolveService:(id)sender {
1.49 - int row = [sender selectedRow];
1.50 - if (row != -1) {
1.51 - GrowlBrowserEntry *entry = [services objectAtIndex:row];
1.52 - NSNetService *serviceToResolve = [entry netService];
1.53 - if (serviceToResolve) {
1.54 - // Make sure to cancel any previous resolves.
1.55 - if (serviceBeingResolved) {
1.56 - [serviceBeingResolved stop];
1.57 - [serviceBeingResolved release];
1.58 - serviceBeingResolved = nil;
1.59 - }
1.60 -
1.61 - currentServiceIndex = row;
1.62 - serviceBeingResolved = serviceToResolve;
1.63 - [serviceBeingResolved retain];
1.64 - [serviceBeingResolved setDelegate:self];
1.65 - if ([serviceBeingResolved respondsToSelector:@selector(resolveWithTimeout:)])
1.66 - [serviceBeingResolved resolveWithTimeout:5.0];
1.67 - else
1.68 - // this selector is deprecated in 10.4
1.69 - [serviceBeingResolved resolve];
1.70 - }
1.71 - }
1.72 + NSLog(@"What calls resolveService:?");
1.73 }
1.74
1.75 - (NSMutableArray *) services {