Monotone-Parent: aac4c2b6ef4eb503b192dfb0ac6784b3f50c3f4c

Monotone-Revision: 3b8627a8b52c86d059ada9c0387459d8654bb482

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-09T16:12:24
Monotone-Branch: ca.inverse.sogo

SoObjects/Contacts/SOGoContactLDAPFolder.h

@@ -34,7 +34,6 @@
 {
   LDAPSource *ldapSource;
   NSMutableDictionary *entries;
-  BOOL ignoreSoObjectHunger;
 }
 
 + (id) folderWithName: (NSString *) aName

SoObjects/Contacts/SOGoContactLDAPFolder.m

@@ -101,7 +101,6 @@
       displayName = nil;
       entries = nil;
       ldapSource = nil;
-      ignoreSoObjectHunger = NO;
     }
 
   return self;
@@ -153,9 +152,7 @@
   //NSLog (@"looking up name '%@'...", objectName);
 
   /* first check attributes directly bound to the application */
-  ignoreSoObjectHunger = YES;
   obj = [super lookupName: objectName inContext: lookupContext acquire: NO];
-  ignoreSoObjectHunger = NO;
 
   if (!obj)
     {
@@ -172,14 +169,7 @@
 
 - (NSArray *) toOneRelationshipKeys
 {
-  NSArray *keys;
-
-  if (ignoreSoObjectHunger)
-    keys = nil;
-  else
-    keys = [ldapSource allEntryIDs];
-
-  return keys;
+  return [ldapSource allEntryIDs];
 }
 
 - (NSArray *) _flattenedRecords: (NSArray *) records