See ChangeLog

Monotone-Parent: 32e14dc57c4f6d9a43de5dfdf3c298091cbf84ea
Monotone-Revision: 761144933c016dd4448ac0614c3937621750bda6

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-01-11T18:38:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte 2010-01-11 18:38:44 +00:00
parent b11895fd59
commit cade28b75c
2 changed files with 24 additions and 4 deletions

View file

@ -1,3 +1,9 @@
2010-01-11 Ludovic Marcotte <lmarcotte@inverse.ca>
* UI/Contacts/UIxContactFolderActions.m (-importVcardData:):
We now support multiple vCards in the same file during
the import process
2010-01-08 Ludovic Marcotte <lmarcotte@inverse.ca>
* SoObjects/SOGo/LDAPSource.{h,m} - bindFields is now

View file

@ -194,13 +194,27 @@
- (int) importVcardData: (NSString *) vcardData
{
NGVCard *card;
NSArray *allCards;
int rc;
rc = 0;
card = [NGVCard parseSingleFromSource: vcardData];
if ([self importVcard: card])
rc = 1;
allCards = [NGVCard parseFromSource: vcardData];
if (allCards && [allCards count])
{
int i;
for (i = 0; i < [allCards count]; i++)
{
if (![self importVcard: [allCards objectAtIndex: i]])
{
rc = 0;
break;
}
else
rc++;
}
}
return rc;
}