Monotone-Parent: b3104cb2f524576b6a02514df135076db60274ea

Monotone-Revision: 1471bacc37d4bfc7718c85c0760024d89c4440ef

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:23:45
Monotone-Branch: ca.inverse.sogo

SoObjects/Contacts/SOGoContactFolder.h

@@ -51,15 +51,13 @@
                          andDisplayName: (NSString *) aDisplayName
                             inContainer: (SOGoObject *) aContainer;
 
+- (NSString *) nameInContainer;
+- (NSString *) displayName;
 
-- (id <SOGoContactObject>) lookupContactWithId: (NSString *) recordId;
 - (NSArray *) lookupContactsWithFilter: (NSString *) filter
                                 sortBy: (NSString *) sortKey
                               ordering: (NSComparisonResult) sortOrdering;
 
-- (void) setDisplayName: (NSString *) aDisplayName;
-- (NSString *) displayName;
-
 @end
 
 #endif /* __Contacts_SOGoContactFolder_H__ */

SoObjects/SOGo/SOGoFolder.h

@@ -24,7 +24,11 @@
 
 #import "SOGoObject.h"
 
-@class NSString, NSArray, NSDictionary;
+@class NSArray;
+@class NSDictionary;
+@class NSMutableDictionary;
+@class NSString;
+
 @class GCSFolder;
 
 /*
@@ -37,10 +41,6 @@
              cyclic references.
 */
 
-@class NSString;
-@class GCSFolder;
-@class NSMutableDictionary;
-
 @interface SOGoFolder : SOGoObject
 {
   NSString  *ocsPath;

SoObjects/SOGo/SOGoObject.h

@@ -34,10 +34,20 @@
   lookup.
 */
 
-@class NSString, NSArray, NSMutableString, NSException, NSTimeZone;
-@class GCSFolderManager, GCSFolder;
-@class SOGoUserFolder, SOGoGroupsFolder;
+#import <NGObjWeb/SoObject.h>
+
+@class NSString;
+@class NSArray;
+@class NSMutableString;
+@class NSException;
+@class NSTimeZone;
+
 @class WOContext;
+@class GCSFolderManager;
+@class GCSFolder;
+
+@class SOGoUserFolder;
+@class SOGoGroupsFolder;
 @class SOGoDAVSet;
 
 #define $(class) NSClassFromString(class)

SoObjects/SOGo/SOGoObject.m

@@ -39,7 +39,6 @@
 #import "SOGoUserFolder.h"
 
 #import "SOGoDAVRendererTypes.h"
-#import "AgenorUserManager.h"
 
 #import "SOGoObject.h"