diff --git a/libtransmission/blocklist.c b/libtransmission/blocklist.c index d96ba95f5..3e56b7ba2 100644 --- a/libtransmission/blocklist.c +++ b/libtransmission/blocklist.c @@ -10,7 +10,6 @@ * $Id$ */ -#include /* isprint() */ #include #include /* free() */ #include @@ -285,6 +284,7 @@ _tr_blocklistSetContent( tr_blocklist * b, if( !tr_pton( rangeBegin, &addr ) ) { printf( "error rangeBegin: %s", line ); + /* don't try to display the actual lines - it causes issues */ tr_err( _( "blocklist skipped invalid address at line %d" ), inCount ); free( line ); continue; @@ -294,6 +294,7 @@ _tr_blocklistSetContent( tr_blocklist * b, if( !tr_pton( rangeEnd, &addr ) ) { printf( "error rangeEnd: %s", line ); + /* don't try to display the actual lines - it causes issues */ tr_err( _( "blocklist skipped invalid address at line %d" ), inCount ); free( line ); continue; diff --git a/macosx/BlocklistDownloader.m b/macosx/BlocklistDownloader.m index 526702f23..4f026e36e 100644 --- a/macosx/BlocklistDownloader.m +++ b/macosx/BlocklistDownloader.m @@ -118,6 +118,10 @@ BlocklistDownloader * fDownloader = nil; - (void) download: (NSURLDownload *) download didFailWithError: (NSError *) error { + #warning remove + NSLog(@"%@", [error localizedDescription]); + NSLog(@"%@", [error localizedFailureReason]); + NSLog(@"%@", [error localizedRecoverySuggestion]); [fViewController setFailed: [error localizedDescription]]; [[BlocklistScheduler scheduler] updateSchedule]; @@ -145,7 +149,7 @@ BlocklistDownloader * fDownloader = nil; NSURLRequest * request = [NSURLRequest requestWithURL: [NSURL URLWithString: LIST_URL]]; fDownload = [[NSURLDownload alloc] initWithRequest: request delegate: self]; - [fDownload setDestination: [NSTemporaryDirectory() stringByAppendingPathComponent: FILE_NAME] allowOverwrite: NO]; + [fDownload setDestination: [NSTemporaryDirectory() stringByAppendingPathComponent: FILE_NAME] allowOverwrite: YES]; } - (void) finishDownloadSuccess diff --git a/macosx/BlocklistDownloaderViewController.m b/macosx/BlocklistDownloaderViewController.m index 12d4d82a2..9768197e3 100644 --- a/macosx/BlocklistDownloaderViewController.m +++ b/macosx/BlocklistDownloaderViewController.m @@ -115,8 +115,7 @@ [alert setMessageText: NSLocalizedString(@"Download of the blocklist failed.", "Blocklist -> message")]; [alert setAlertStyle: NSWarningAlertStyle]; - [alert setInformativeText: [NSString stringWithFormat: @"%@ - %@", NSLocalizedString(@"Error", "Blocklist -> message"), - error]]; + [alert setInformativeText: error]; [alert beginSheetModalForWindow: [fPrefsController window] modalDelegate: self didEndSelector: @selector(failureSheetClosed:returnCode:contextInfo:) contextInfo: nil];