Monotone-Parent: 6267e23d4a4d587847618923c35a202030ce9ed0

Monotone-Revision: 5244339e45ef9095573b10733228f85b81a17377

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-10-13T14:10:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2009-10-13 14:10:17 +00:00
parent 049be25681
commit 114e8bddc3
15 changed files with 32 additions and 68 deletions
+8 -16
View File
@@ -48,9 +48,7 @@
{
NSMutableString *cardString;
cardString = [NSMutableString new];
[cardString autorelease];
cardString = [NSMutableString string];
if (value && [value length] > 0)
{
if (label)
@@ -129,7 +127,7 @@
NSString *email, *mailTo;
NSMutableArray *emails;
emails = [NSMutableArray new];
emails = [NSMutableArray array];
mailTo = nil;
[emails addObjectsFromArray: [card childrenWithTag: @"email"]];
@@ -151,8 +149,6 @@
@"%@</a>", email, [card fn], email, email];
}
[emails release];
return [self _cardStringWithLabel: @"Additional Email:"
value: mailTo];
}
@@ -276,8 +272,7 @@
city = [homeAdr value: 3];
prov = [homeAdr value: 4];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: city];
if ([city length] > 0 && [prov length] > 0)
[data appendString: @", "];
@@ -294,8 +289,7 @@
postalCode = [homeAdr value: 5];
country = [homeAdr value: 6];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
[data appendFormat: @", ", country];
@@ -417,8 +411,7 @@
city = [workAdr value: 3];
prov = [workAdr value: 4];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: city];
if ([city length] > 0 && [prov length] > 0)
[data appendString: @", "];
@@ -435,8 +428,7 @@
postalCode = [workAdr value: 5];
country = [workAdr value: 6];
data = [NSMutableString new];
[data autorelease];
data = [NSMutableString string];
[data appendString: postalCode];
if ([postalCode length] > 0 && [country length] > 0)
[data appendFormat: @", ", country];
@@ -513,13 +505,13 @@
- (id <WOActionResults>) vcardAction
{
#warning this method is unused
WOResponse *response;
card = [[self clientObject] vCard];
if (card)
{
response = [WOResponse new];
[response autorelease];
response = [context response];
[response setHeader: @"text/vcard" forKey: @"Content-type"];
[response appendContentString: [card versitString]];
}