adium 4576:e537c0829dde: Minor fix to previous fix :).

commits at adium.im commits at adium.im
Fri Jan 27 16:43:34 UTC 2012


details:	http://hg.adium.im/adium/rev/e537c0829dde
revision:	4576:e537c0829dde
branch:		(none)
author:		Adrian Godoroja <robotive at me.com>
date:		Fri Jan 27 18:43:27 2012 +0200

Minor fix to previous fix :).

diffs (48 lines):

diff -r 5eddeda585e7 -r e537c0829dde Frameworks/AIUtilities Framework/Source/AIKeychain.m
--- a/Frameworks/AIUtilities Framework/Source/AIKeychain.m	Fri Jan 27 18:19:55 2012 +0200
+++ b/Frameworks/AIUtilities Framework/Source/AIKeychain.m	Fri Jan 27 18:43:27 2012 +0200
@@ -929,17 +929,19 @@
 			   keychainItem:(out SecKeychainItemRef *)outKeychainItem
 					  error:(out NSError **)outError
 {
+	BOOL success = NO;
+
 	if (!password) {
 		// Remove the password
-		return [self deleteInternetPasswordForServer:server
-									  securityDomain:domain
-											 account:account
-												path:path
-												port:port
-											protocol:protocol
-								  authenticationType:authType
-										keychainItem:outKeychainItem
-											   error:outError];
+		success = [self deleteInternetPasswordForServer:server
+										 securityDomain:domain
+												account:account
+												   path:path
+												   port:port
+											   protocol:protocol
+									 authenticationType:authType
+										   keychainItem:outKeychainItem
+												  error:outError];
 	} else {
 		// Add it if it does not exist
 		NSError *error = nil;
@@ -1013,11 +1015,13 @@
 
 				[pool release];
 				[error autorelease];
-				
-				return (err = noErr);
 			} // if (err == errSecDuplicateItem)
+			
+			success = (err == noErr);
 		} // if (error) (addInternetPassword:...)
 	} // if (password)
+	
+	return success;
 }
 
 - (BOOL)setInternetPassword:(NSString *)password




More information about the commits mailing list