fix crash reported in #640; other insignificant changes

This commit is contained in:
Mitchell Livingston 2008-01-19 05:37:16 +00:00
parent 9423e89aec
commit 27c2833ec3
4 changed files with 1482 additions and 1479 deletions

View File

@ -63,7 +63,7 @@
if (fQuitting) if (fQuitting)
{ {
[self badge: [NSImage imageNamed: @"QuitBadge.png"] string: NSLocalizedString(@"Quitting", "Dock Badger -> quit") [self badge: [NSImage imageNamed: @"QuitBadge.png"] string: NSLocalizedString(@"Quitting", "Dock Badger -> quit")
atHeight: (rect.size.height - [[NSImage imageNamed: @"UploadBadge"] size].height) * 0.5]; atHeight: (rect.size.height - [[NSImage imageNamed: @"QuitBadge.png"] size].height) * 0.5];
return; return;
} }

View File

@ -684,7 +684,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
- (void) openFiles: (NSArray *) filenames addType: (addType) type forcePath: (NSString *) path - (void) openFiles: (NSArray *) filenames addType: (addType) type forcePath: (NSString *) path
{ {
#warning make submethod #warning checks could probably be removed, since location is checked when starting
if (!path && [fDefaults boolForKey: @"UseIncompleteDownloadFolder"] if (!path && [fDefaults boolForKey: @"UseIncompleteDownloadFolder"]
&& access([[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0)) && access([[[fDefaults stringForKey: @"IncompleteDownloadFolder"] stringByExpandingTildeInPath] UTF8String], 0))
{ {

File diff suppressed because it is too large Load Diff

View File

@ -333,6 +333,7 @@
} }
else; else;
if ([NSApp isOnLeopardOrBetter])
[controlView updateTrackingAreas]; [controlView updateTrackingAreas];
return YES; return YES;