LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '083c5eacbea5cf39b26ae89e1fa54412357634af' 

and '5549339aa6c865731d17f2f65a560a401cb19e1f'

Monotone-Parent: 083c5eacbea5cf39b26ae89e1fa54412357634af
Monotone-Parent: 5549339aa6c865731d17f2f65a560a401cb19e1f
Monotone-Revision: a6b2e3c5d395d584befdfa5576912f12276f0677

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-09-22T20:54:22
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
C Robert 2009-09-22 20:54:22 +00:00
parent 75365c7e5f 4af84368a5
commit 5104dcb4c6
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-09-22 Ludovic Marcotte <lmarcotte@inverse.ca>
* Updated the documentation for the Invisible -> Flagged
mail column change.
* SoObjects/Contacts/NGVCard+SOGo.m - better error-handling.
2009-09-22 Cyril Robert <crobert@inverse.ca>
* UI/Scheduler/UIxCalFolderActions.m (exportAction): Used bareFetchFields from

BIN
Documentation/SOGo Installation Guide.odt
View File

Binary file not shown.

21
SoObjects/Contacts/NGVCard+SOGo.m
View File

@ -49,10 +49,23 @@
@"organizationalPerson", @"inetOrgPerson",
@"mozillaAbPersonObsolete", nil]
forKey: @"objectclass"];
[entry setObject: [[self n] objectAtIndex: 1] forKey: @"givenName"];
[entry setObject: [[self n] objectAtIndex: 0] forKey: @"sn"];
[entry setObject: [self fn] forKey: @"cn"];
[entry setObject: [self preferredEMail] forKey: @"mail"];
tmp = ([[self n] count] > 1 ? [[self n] objectAtIndex: 1] : nil);
if (tmp)
[entry setObject: tmp forKey: @"givenName"];
tmp = ([[self n] count] ? [[self n] objectAtIndex: 0] : nil);
if (tmp)
[entry setObject: tmp forKey: @"sn"];
tmp = [self fn];
if (tmp)
[entry setObject: tmp forKey: @"cn"];
tmp = [self preferredEMail];
if (tmp)
[entry setObject: tmp forKey: @"mail"];
[entry setObject: @"0Z" forKey: @"modifytimestamp"];
buffer = [self nickname];