This commit is contained in:
Ludovic Marcotte
2013-04-16 14:33:57 -04:00
parent 139c14d9e1
commit 62fee93d86
2 changed files with 9 additions and 5 deletions
+3 -2
View File
@@ -277,7 +277,7 @@
- (void) _fetchCN - (void) _fetchCN
{ {
cn = [self _fetchFieldForUser: @"cn"]; cn = [[self _fetchFieldForUser: @"cn"] stringByTrimmingSpaces];
[cn retain]; [cn retain];
} }
@@ -703,7 +703,8 @@
if (![fullName length]) if (![fullName length])
fullName = login; fullName = login;
[identity setObject: fullName forKey: @"fullName"]; [identity setObject: fullName forKey: @"fullName"];
[identity setObject: [mails objectAtIndex: count] forKey: @"email"]; [identity setObject: [[mails objectAtIndex: count] stringByTrimmingSpaces]
forKey: @"email"];
if ([replyTo length] > 0) if ([replyTo length] > 0)
[identity setObject: replyTo forKey: @"replyTo"]; [identity setObject: replyTo forKey: @"replyTo"];
+6 -3
View File
@@ -558,7 +558,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
{ {
if ([newValue length] == 0) if ([newValue length] == 0)
newValue = nil; newValue = nil;
[self setObject: newValue forKey: @"SOGoMailCustomFullName"]; [self setObject: [newValue stringByTrimmingSpaces]
forKey: @"SOGoMailCustomFullName"];
} }
- (NSString *) mailCustomFullName - (NSString *) mailCustomFullName
@@ -570,7 +571,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
{ {
if ([newValue length] == 0) if ([newValue length] == 0)
newValue = nil; newValue = nil;
[self setObject: newValue forKey: @"SOGoMailCustomEmail"]; [self setObject: [newValue stringByTrimmingSpaces]
forKey: @"SOGoMailCustomEmail"];
} }
- (NSString *) mailCustomEmail - (NSString *) mailCustomEmail
@@ -582,7 +584,8 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
{ {
if ([newValue length] == 0) if ([newValue length] == 0)
newValue = nil; newValue = nil;
[self setObject: newValue forKey: @"SOGoMailReplyTo"]; [self setObject: [newValue stringByTrimmingSpaces]
forKey: @"SOGoMailReplyTo"];
} }
- (NSString *) mailReplyTo - (NSString *) mailReplyTo