amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-07 06:18:50 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 00c7db6a04b837e2c03bee73c5699a0bafaf4684

Browse Source 
Monotone-Revision: b4d434073c4829245e196a7cbb5d657675d0c67e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-08T15:10:40
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-05-08 15:10:40 +00:00
parent 8ddf75dbbf
commit 5e21997cc4
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2007-05-08 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Contacts/SOGoContactLDAPEntry.[hm]: renamed to
SOGOContactLDIFEntry.
* SoObjects/Contacts/NGLdapEntry+Contact.[hm]: removed class
module, obsoleted by code in SOGo/LDAPSource.[hm].

18
SoObjects/Contacts/SOGoContactLDAPEntry.h → SoObjects/Contacts/SOGoContactLDIFEntry.h
View File

@@ -30,20 +30,20 @@
@class SOGoContactLDAPFolder;
@class NGLdapEntry;
@interface SOGoContactLDAPEntry : SOGoObject <SOGoContactObject>
@interface SOGoContactLDAPEntry : NSObject <SOGoContactObject>
{
NSString *name;
NGLdapEntry *ldapEntry;
NGVCard *vcard;
id container;
}
+ (SOGoContactLDAPEntry *) contactEntryWithName: (NSString *) aName
withLDAPEntry: (NGLdapEntry *) anEntry
inContainer: (id) aContainer;
- (id) initWithName: (NSString *) aName
withLDAPEntry: (NGLdapEntry *) anEntry
inContainer: (id) aContainer;
- (void) setLDAPEntry: (NGLdapEntry *) anEntry;
+ (SOGoContactLDAPEntry *) contactEntryWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
inContainer: (id) newContainer;
- (id) initWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
inContainer: (id) newContainer;
@end

47
SoObjects/Contacts/SOGoContactLDAPEntry.m → SoObjects/Contacts/SOGoContactLDIFEntry.m
View File

@@ -27,24 +27,19 @@
#import <NGCards/NGVCard.h>
#import <NGCards/CardVersitRenderer.h>
#import <NGLdap/NGLdapEntry.h>
#import <NGLdap/NGLdapAttribute.h>
#import "NGLdapEntry+Contact.h"
#import "SOGoContactLDAPEntry.h"
@implementation SOGoContactLDAPEntry
+ (SOGoContactLDAPEntry *) contactEntryWithName: (NSString *) aName
withLDAPEntry: (NGLdapEntry *) anEntry
inContainer: (id) aContainer
+ (SOGoContactLDAPEntry *) contactEntryWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
inContainer: (id) newContainer
{
SOGoContactLDAPEntry *entry;
entry = [[self alloc] initWithName: aName
withLDAPEntry: anEntry
inContainer: aContainer];
entry = [[self alloc] initWithName: newName
withLDAPEntry: newEntry
inContainer: newContainer];
[entry autorelease];
return entry;
@@ -66,31 +61,31 @@
NSLog (@"dumping finished..");
}
- (id) initWithName: (NSString *) aName
withLDAPEntry: (NGLdapEntry *) anEntry
inContainer: (id) aContainer
- (id) initWithName: (NSString *) newName
withLDAPEntry: (NGLdapEntry *) newEntry
inContainer: (id) newContainer
{
if ((self = [super initWithName: aName inContainer: aContainer]))
{
vcard = nil;
[self setLDAPEntry: anEntry];
}
self = [self init];
ASSIGN (name, newName);
ASSIGN (container, newContainer);
ASSIGN (ldapEntry, newEntry);
vcard = nil;
[self dumpEntry: anEntry];
// [self dumpEntry: anEntry];
return self;
}
- (void) dealloc
- (NSString *) nameInContainer
{
if (vcard)
[vcard release];
[super dealloc];
return name;
}
- (void) setLDAPEntry: (NGLdapEntry *) anEntry;
- (void) dealloc
{
ldapEntry = anEntry;
[vcard release];
[ldapEntry release];
[super dealloc];
}
- (NSString *) contentAsString