mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-26 09:37:56 +00:00
Code Issues Releases Wiki Activity

eliminate some redundant open methods

Browse source
This commit is contained in:
Mitchell Livingston 2008-01-10 16:46:15 +00:00
parent b0cf977624
commit 5b54605822
3 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
macosx/Controller.h
View file

@ -118,7 +118,6 @@ typedef enum
BOOL fRemoteQuit;
}
- (void) openFiles: (NSArray *) filenames;
- (void) openFiles: (NSArray *) filenames addType: (addType) type forcePath: (NSString *) path;
- (void) askOpenConfirmed: (AddWindowController *) addController add: (BOOL) add;
- (void) openCreatedFile: (NSNotification *) notification;

25
macosx/Controller.m
View file

@ -865,12 +865,9 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
//called on by applescript
- (void) open: (NSArray *) files
{
[self performSelectorOnMainThread: @selector(openFiles:) withObject: files waitUntilDone: NO];
}
- (void) openFiles: (NSArray *) filenames
{
[self openFiles: filenames addType: ADD_NORMAL forcePath: nil];
NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: files, @"Filenames",
[NSNumber numberWithInt: ADD_NORMAL], @"AddType", nil];
[self performSelectorOnMainThread: @selector(openFilesWithDict:) withObject: dict waitUntilDone: NO];
}
- (void) openShowSheet: (id) sender
@ -891,19 +888,11 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
if (code == NSOKButton)
{
NSDictionary * dictionary = [[NSDictionary alloc] initWithObjectsAndKeys:
[panel filenames], @"Files", useOptions, @"UseOptions", nil];
[self performSelectorOnMainThread: @selector(openFromSheet:) withObject: dictionary waitUntilDone: NO];
[panel filenames], @"Files", [useOptions boolValue] ? ADD_SHOW_OPTIONS : ADD_NORMAL, @"UseOptions", nil];
[self performSelectorOnMainThread: @selector(openFilesWithDict:) withObject: dictionary waitUntilDone: NO];
}
}
- (void) openFromSheet: (NSDictionary *) dictionary
{
[self openFiles: [dictionary objectForKey: @"Files"] addType: [[dictionary objectForKey: @"UseOptions"] boolValue]
? ADD_SHOW_OPTIONS : ADD_NORMAL forcePath: nil];
[dictionary release];
}
- (void) duplicateOpenAlert: (NSString *) name
{
if (![fDefaults boolForKey: @"WarningDuplicate"])
@ -2380,7 +2369,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
case TR_OK:
if (!ask)
count = [fTorrents count];
[self openFiles: [NSArray arrayWithObject: file]];
[self openFiles: [NSArray arrayWithObject: file] addType: ADD_NORMAL forcePath: nil];
//check if torrent was opened
if (!ask && [fTorrents count] > count)
@ -3875,7 +3864,7 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
{
int oldCount = [fTorrents count];
[self openFiles: torrents];
[self openFiles: torrents addType: ADD_NORMAL forcePath: nil];
return [fTorrents count] > oldCount;
}

1
macosx/InfoWindowController.m
View file

@ -759,6 +759,7 @@ typedef enum
break;
}
#warning redo
NSMutableArray * peerStatusArray = [NSMutableArray arrayWithCapacity: 2];
if ([[peer objectForKey: @"PeerChoked"] boolValue])
[peerStatusArray addObject: NSLocalizedString(@"Refusing to send data to peer", "Inspector -> peer -> status")];