adium 3248:2e18f39042b2: Fix a situation where contacts would ha...

commits at adium.im commits at adium.im
Mon Jun 28 12:35:09 UTC 2010


details:	http://hg.adium.im/adium/rev/2e18f39042b2
revision:	3248:2e18f39042b2
author:		Robert Vehse
date:		Mon Jun 28 14:32:25 2010 +0200

Fix a situation where contacts would have a blank alias when their AB card nickname is left blank. Patch by Rigdern reviewed by sphynx. Thanks, folks!
(transplanted from df284444ba05d26714589ed595466223dd3ff605)

diffs (14 lines):

diff -r ec31870b2f05 -r 2e18f39042b2 Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m	Mon Jun 28 14:26:47 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m	Mon Jun 28 14:32:25 2010 +0200
@@ -433,7 +433,9 @@
 	if (useMiddleName && middleName)
 		firstName = [NSString stringWithFormat:@"%@ %@", firstName, middleName];
 
-	if (useNickName && (nickName = [person valueForProperty:kABNicknameProperty])) {
+	if (useNickName &&
+		(nickName = [person valueForProperty:kABNicknameProperty]) &&
+		![nickName isEqualToString:@""]) {
 		displayName = nickName;
 
 	} else if (!lastName || (thisDisplayFormat == First)) {  



More information about the commits mailing list