mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

get the mac build to compile again

This commit is contained in:
Mitchell Livingston 2009-08-05 02:13:45 +00:00
parent 6a2879f0ee
commit 851595b11c
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
macosx/Controller.m
View File

@ -797,7 +797,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
tr_ctor * ctor = tr_ctorNew(fLib); tr_ctor * ctor = tr_ctorNew(fLib);
tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]); tr_ctorSetMetainfoFromFile(ctor, [torrentPath UTF8String]);
int result = tr_torrentParse(ctor, &info); int result = tr_torrentParse(ctor, &info);
if (result != TR_OK) if (result != TR_PARSE_OK)
{ {
if (result == TR_PARSE_DUPLICATE) if (result == TR_PARSE_DUPLICATE)
[self duplicateOpenAlert: [NSString stringWithUTF8String: info.name]]; [self duplicateOpenAlert: [NSString stringWithUTF8String: info.name]];
@ -2437,7 +2437,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
switch (tr_torrentParse(ctor, NULL)) switch (tr_torrentParse(ctor, NULL))
{ {
case TR_OK: case TR_PARSE_OK:
[self openFiles: [NSArray arrayWithObject: fullFile] addType: ADD_AUTO forcePath: nil]; [self openFiles: [NSArray arrayWithObject: fullFile] addType: ADD_AUTO forcePath: nil];
[GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Torrent File Auto Added", "Growl notification title") [GrowlApplicationBridge notifyWithTitle: NSLocalizedString(@"Torrent File Auto Added", "Growl notification title")
@ -2445,7 +2445,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
clickContext: nil]; clickContext: nil];
break; break;
case TR_EINVALID: case TR_PARSE_ERR:
[fAutoImportedNames removeObject: file]; [fAutoImportedNames removeObject: file];
} }
@ -2677,7 +2677,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
torrent = YES; torrent = YES;
tr_ctor * ctor = tr_ctorNew(fLib); tr_ctor * ctor = tr_ctorNew(fLib);
tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]); tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
if (tr_torrentParse(ctor, NULL) == TR_OK) if (tr_torrentParse(ctor, NULL) == TR_PARSE_OK)
{ {
if (!fOverlayWindow) if (!fOverlayWindow)
fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib forWindow: fWindow]; fOverlayWindow = [[DragOverlayWindow alloc] initWithLib: fLib forWindow: fWindow];
@ -2739,7 +2739,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
torrent = YES; torrent = YES;
tr_ctor * ctor = tr_ctorNew(fLib); tr_ctor * ctor = tr_ctorNew(fLib);
tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]); tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
if (tr_torrentParse(ctor, NULL) == TR_OK) if (tr_torrentParse(ctor, NULL) == TR_PARSE_OK)
[filesToOpen addObject: file]; [filesToOpen addObject: file];
tr_ctorFree(ctor); tr_ctorFree(ctor);
} }

2
macosx/DragOverlayWindow.m
View File

@ -89,7 +89,7 @@
tr_ctor * ctor = tr_ctorNew(fLib); tr_ctor * ctor = tr_ctorNew(fLib);
tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]); tr_ctorSetMetainfoFromFile(ctor, [file UTF8String]);
tr_info info; tr_info info;
if (tr_torrentParse(ctor, &info) == TR_OK) if (tr_torrentParse(ctor, &info) == TR_PARSE_OK)
{ {
count++; count++;
size += info.totalSize; size += info.totalSize;

10
macosx/Torrent.m
View File

@ -1609,20 +1609,20 @@ int trashDataFile(const char * filename)
tr_ctorSetPaused(ctor, TR_FORCE, YES); tr_ctorSetPaused(ctor, TR_FORCE, YES);
tr_ctorSetPeerLimit(ctor, TR_FALLBACK, [fDefaults integerForKey: @"PeersTorrent"]); tr_ctorSetPeerLimit(ctor, TR_FALLBACK, [fDefaults integerForKey: @"PeersTorrent"]);
int result = TR_EINVALID; int result = TR_PARSE_ERR;
if (path) if (path)
result = tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]); result = tr_ctorSetMetainfoFromFile(ctor, [path UTF8String]);
//backup - shouldn't be needed after upgrade to 1.70 //backup - shouldn't be needed after upgrade to 1.70
if (result != TR_OK && hashString) if (result != TR_PARSE_OK && hashString)
result = tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]); result = tr_ctorSetMetainfoFromHash(ctor, [hashString UTF8String]);
if (result == TR_OK) if (result == TR_PARSE_OK)
{ {
tr_info info; tr_info info;
result = tr_torrentParse(ctor, &info); result = tr_torrentParse(ctor, &info);
if (result == TR_OK) if (result == TR_PARSE_OK)
{ {
NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]] NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info.name]]
? fIncompleteFolder : fDownloadFolder; ? fIncompleteFolder : fDownloadFolder;
@ -1630,7 +1630,7 @@ int trashDataFile(const char * filename)
fHandle = tr_torrentNew(ctor, NULL); fHandle = tr_torrentNew(ctor, NULL);
} }
if (result != TR_EINVALID) if (result != TR_PARSE_ERR)
tr_metainfoFree(&info); tr_metainfoFree(&info);
} }