Monotone-Parent: b77c80d28969876aa496ff580015697daf5bbc94

Monotone-Revision: 2a1fb6783ff2b6c49336efc854fee0d29cab013a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-14T20:36:36
Monotone-Branch: ca.inverse.sogo

SoObjects/Contacts/SOGoContactFolder.h

@@ -41,11 +41,6 @@
 
 #import <SoObjects/SOGo/SOGoFolder.h>
 
-#define folderListingFields [NSArray arrayWithObjects: @"c_name", @"cn", \
-                                     @"sn", @"givenname", @"l",          \
-                                     @"mail", @"telephonenumber",        \
-                                     nil]
-
 @protocol SOGoContactFolder <NSObject>
 
 + (id <SOGoContactFolder>) contactFolderWithName: (NSString *) aName

SoObjects/Contacts/SOGoContactFolders.m

@@ -98,6 +98,7 @@
           setBindDN: [udAB objectForKey: @"bindDN"]
           setBindPW: [udAB objectForKey: @"bindPW"]
           setContactIdentifier: [udAB objectForKey: @"idField"]
+          setUserIdentifier: [udAB objectForKey: @"userIdField"]
           setRootDN: [udAB objectForKey: @"rootDN"]];
       [contactFolders setObject: ab forKey: [udAB objectForKey: @"id"]];
       udAB = [ldapABs nextObject];

SoObjects/Contacts/SOGoContactGCSFolder.m

@@ -26,6 +26,11 @@
 #import "SOGoContactGCSEntry.h"
 #import "SOGoContactGCSFolder.h"
 
+#define folderListingFields [NSArray arrayWithObjects: @"c_name", @"cn", \
+                                     @"sn", @"givenname", @"l",          \
+                                     @"mail", @"telephonenumber",        \
+                                     nil]
+
 @implementation SOGoContactGCSFolder
 
 + (id <SOGoContactFolder>) contactFolderWithName: (NSString *) aName