LSVCardCompanyFormatter.m (opengroupware-5.5rc2) | : | LSVCardCompanyFormatter.m (opengroupware-5.5rc3) | ||
---|---|---|---|---|
skipping to change at line 202 | skipping to change at line 202 | |||
if (isdigit([tmp characterAtIndex:0])) | if (isdigit([tmp characterAtIndex:0])) | |||
[self _appendName:@"X-ICQ" andValue:tmp toVCard:_vCard]; | [self _appendName:@"X-ICQ" andValue:tmp toVCard:_vCard]; | |||
else if ([tmp rangeOfString:@"@"].length > 0) | else if ([tmp rangeOfString:@"@"].length > 0) | |||
[self _appendName:@"X-JABBER" andValue:tmp toVCard:_vCard]; | [self _appendName:@"X-JABBER" andValue:tmp toVCard:_vCard]; | |||
else | else | |||
[self _appendName:@"X-AIM" andValue:tmp toVCard:_vCard]; | [self _appendName:@"X-AIM" andValue:tmp toVCard:_vCard]; | |||
} | } | |||
/* X-EVOLUTION-ANNIVERSARY */ | /* X-EVOLUTION-ANNIVERSARY */ | |||
if ([(tmp = [_contact valueForKey:@"anniversary"]) isNotNull]) { | if ([(tmp = [_contact valueForKey:@"anniversary"]) isNotNull]) { | |||
tmp = [[NSString alloc] initWithFormat:@"%04i-%02i-%02i", | tmp = [[NSString alloc] initWithFormat:@"%04"PRIiPTR"-%02"PRIiPTR"-%02"PRIiP TR, | |||
[tmp yearOfCommonEra], [tmp monthOfYear], | [tmp yearOfCommonEra], [tmp monthOfYear], | |||
[tmp dayOfMonth]]; | [tmp dayOfMonth]]; | |||
[self _appendName:@"X-EVOLUTION-ANNIVERSARY" andValue:tmp | [self _appendName:@"X-EVOLUTION-ANNIVERSARY" andValue:tmp | |||
toVCard:_vCard]; | toVCard:_vCard]; | |||
[tmp release]; | [tmp release]; | |||
} | } | |||
} | } | |||
- (NSString *)typeFromVCardTypeHack:(NSString *)type { | - (NSString *)typeFromVCardTypeHack:(NSString *)type { | |||
if (![type isNotNull]) return nil; | if (![type isNotNull]) return nil; | |||
skipping to change at line 522 | skipping to change at line 522 | |||
[self _appendExtraEmails:_person markFirstAsPreferred:YES toVCard:_vCard]; | [self _appendExtraEmails:_person markFirstAsPreferred:YES toVCard:_vCard]; | |||
if ([(tmp = [_person valueForKey:@"email"]) isNotNull]) | if ([(tmp = [_person valueForKey:@"email"]) isNotNull]) | |||
[self _appendName:@"EMAIL" andValue:tmp toVCard:_vCard]; | [self _appendName:@"EMAIL" andValue:tmp toVCard:_vCard]; | |||
// NICKNAME | // NICKNAME | |||
if ([(tmp = [_person valueForKey:@"description"]) isNotNull]) | if ([(tmp = [_person valueForKey:@"description"]) isNotNull]) | |||
[self _appendName:@"NICKNAME" andValue:tmp toVCard:_vCard]; | [self _appendName:@"NICKNAME" andValue:tmp toVCard:_vCard]; | |||
// BDAY | // BDAY | |||
if ([(tmp = [_person valueForKey:@"birthday"]) isNotNull]) { | if ([(tmp = [_person valueForKey:@"birthday"]) isNotNull]) { | |||
tmp = [[NSString alloc] initWithFormat:@"%04i-%02i-%02i", | tmp = [[NSString alloc] initWithFormat:@"%04"PRIiPTR"-%02"PRIiPTR"-%02"PRIiP TR, | |||
[tmp yearOfCommonEra], [tmp monthOfYear], | [tmp yearOfCommonEra], [tmp monthOfYear], | |||
[tmp dayOfMonth]]; | [tmp dayOfMonth]]; | |||
[self _appendName:@"BDAY" andValue:tmp toVCard:_vCard]; | [self _appendName:@"BDAY" andValue:tmp toVCard:_vCard]; | |||
[tmp release]; | [tmp release]; | |||
} | } | |||
// TITLE | // TITLE | |||
if ([(tmp = [_person valueForKey:@"job_title"]) isNotNull]) | if ([(tmp = [_person valueForKey:@"job_title"]) isNotNull]) | |||
[self _appendName:@"TITLE" andValue:tmp toVCard:_vCard]; | [self _appendName:@"TITLE" andValue:tmp toVCard:_vCard]; | |||
// FBURL | // FBURL | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added |