mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-19 18:35:25 +00:00
Monotone-Parent: ebf9e259f35f824bac1d65aaaeb22d27c2e81357
Monotone-Revision: a3af3c8ec093a513104f71c796d21d4ad5b438a5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-01T20:47:14 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -1,5 +1,9 @@
|
||||
2007-06-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* SoObjects/Contacts/SOGoContactGCSEntry.m ([SOGoContactGCSEntry
|
||||
-vCard]): directly use the "content" ivar since it is initialized
|
||||
during object creation.
|
||||
|
||||
* SoObjects/Contacts/SOGoContactLDAPFolder.m
|
||||
([SOGoContactLDAPFolder -init]): no longer handle the
|
||||
nameInContainer no the container ivars. They were removed because
|
||||
|
||||
@@ -40,8 +40,7 @@
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
if (card)
|
||||
[card release];
|
||||
[card release];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
@@ -49,13 +48,10 @@
|
||||
|
||||
- (NGVCard *) vCard
|
||||
{
|
||||
NSString *contentStr;
|
||||
|
||||
if (!card)
|
||||
{
|
||||
contentStr = [self contentAsString];
|
||||
if ([[contentStr uppercaseString] hasPrefix:@"BEGIN:VCARD"])
|
||||
card = [NGVCard parseSingleFromSource: contentStr];
|
||||
if ([[content uppercaseString] hasPrefix: @"BEGIN:VCARD"])
|
||||
card = [NGVCard parseSingleFromSource: content];
|
||||
else
|
||||
card = [NGVCard cardWithUid: [self nameInContainer]];
|
||||
[card retain];
|
||||
|
||||
Reference in New Issue
Block a user