Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverse r13248-r13250, since ARC doesn't support 32-bit.

Browse Source
This commit is contained in:
Mitchell Livingston
2012-03-13 02:52:11 +00:00
parent 21075ebd5d
commit 2406572104
71 changed files with 737 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
macosx/PrefsController.m
View File

@@ -127,7 +127,7 @@ tr_session * fHandle;
fRPCWhitelistArray = [[fDefaults arrayForKey: @"RPCWhitelist"] mutableCopy];
if (!fRPCWhitelistArray)
fRPCWhitelistArray = [NSMutableArray arrayWithObject: @"127.0.0.1"];
fRPCWhitelistArray = [[NSMutableArray arrayWithObject: @"127.0.0.1"] retain];
[self updateRPCWhitelist];
//reset old Sparkle settings from previous versions
@@ -155,10 +155,14 @@ tr_session * fHandle;
if (fPortChecker)
{
[fPortChecker cancelProbe];
[fPortChecker release];
}
[fRPCWhitelistArray release];
[fRPCPassword release];
[super dealloc];
}
- (void) awakeFromNib
@@ -172,6 +176,7 @@ tr_session * fHandle;
[toolbar setSizeMode: NSToolbarSizeModeRegular];
[toolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
[[self window] setToolbar: toolbar];
[toolbar release];
[self setPrefView: nil];
@@ -306,10 +311,11 @@ tr_session * fHandle;
}
else
{
[item release];
return nil;
}
return item;
return [item autorelease];
}
- (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
@@ -391,6 +397,7 @@ tr_session * fHandle;
if (fPortChecker)
{
[fPortChecker cancelProbe];
[fPortChecker release];
}
BOOL delay = natStatusChanged || tr_sessionIsPortForwardingEnabled(fHandle);
fPortChecker = [[PortChecker alloc] initForPort: fPeerPort delay: delay withDelegate: self];
@@ -418,6 +425,7 @@ tr_session * fHandle;
NSAssert1(NO, @"Port checker returned invalid status: %d", [fPortChecker status]);
break;
}
[fPortChecker release];
fPortChecker = nil;
}
@@ -428,7 +436,7 @@ tr_session * fHandle;
NSArray * directories = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory,
NSUserDomainMask | NSLocalDomainMask | NSSystemDomainMask, YES);
for (__strong NSString * directory in directories)
for (NSString * directory in directories)
{
directory = [directory stringByAppendingPathComponent: @"Sounds"];
@@ -436,7 +444,7 @@ tr_session * fHandle;
if ([[NSFileManager defaultManager] fileExistsAtPath: directory isDirectory: &isDirectory] && isDirectory)
{
NSArray * directoryContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: directory error: NULL];
for (__strong NSString * sound in directoryContents)
for (NSString * sound in directoryContents)
{
sound = [sound stringByDeletingPathExtension];
if ([NSSound soundNamed: sound])
@@ -693,7 +701,7 @@ tr_session * fHandle;
+ (NSDate *) timeSumToDate: (NSInteger) sum
{
NSDateComponents * comps = [[NSDateComponents alloc] init];
NSDateComponents * comps = [[[NSDateComponents alloc] init] autorelease];
[comps setHour: sum / 60];
[comps setMinute: sum % 60];
@@ -702,7 +710,8 @@ tr_session * fHandle;
- (BOOL) control: (NSControl *) control textShouldBeginEditing: (NSText *) fieldEditor
{
fInitialString = [control stringValue];
[fInitialString release];
fInitialString = [[control stringValue] retain];
return YES;
}
@@ -713,6 +722,7 @@ tr_session * fHandle;
if (fInitialString)
{
[control setStringValue: fInitialString];
[fInitialString release];
fInitialString = nil;
}
return NO;
@@ -748,7 +758,7 @@ tr_session * fHandle;
- (void) setDefaultForMagnets: (id) sender
{
NSString * bundleID = [[NSBundle mainBundle] bundleIdentifier];
const OSStatus result = LSSetDefaultHandlerForURLScheme((CFStringRef)@"magnet", (__bridge CFStringRef)bundleID);
const OSStatus result = LSSetDefaultHandlerForURLScheme((CFStringRef)@"magnet", (CFStringRef)bundleID);
if (result != noErr)
NSLog(@"Failed setting default magnet link handler");
}
@@ -972,6 +982,7 @@ tr_session * fHandle;
- (void) setRPCPassword: (id) sender
{
[fRPCPassword release];
fRPCPassword = [[sender stringValue] copy];
const char * password = [[sender stringValue] UTF8String];
@@ -987,6 +998,7 @@ tr_session * fHandle;
SecKeychainFindGenericPassword(NULL, strlen(RPC_KEYCHAIN_SERVICE), RPC_KEYCHAIN_SERVICE,
strlen(RPC_KEYCHAIN_NAME), RPC_KEYCHAIN_NAME, &passwordLength, (void **)&password, NULL);
[fRPCPassword release];
if (password != NULL)
{
char fullPassword[passwordLength+1];