From 0feac0b7a8af9a2870a347cd0698f5f75329682a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 14 Aug 2006 20:36:36 +0000
Subject: [PATCH] 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    | 5 -----
 SoObjects/Contacts/SOGoContactFolders.m   | 1 +
 SoObjects/Contacts/SOGoContactGCSFolder.m | 5 +++++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SoObjects/Contacts/SOGoContactFolder.h b/SoObjects/Contacts/SOGoContactFolder.h
index 27f171744..28f180c61 100644
--- a/SoObjects/Contacts/SOGoContactFolder.h
+++ b/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
diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m
index 70607aa8a..a4c455f58 100644
--- a/SoObjects/Contacts/SOGoContactFolders.m
+++ b/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];
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 822c3f422..477b6fb60 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/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