Monotone-Parent: 3326603011bb525080c2877dffe59c41fad761da

Monotone-Revision: 2092d2f6cbf44065b7b2270044f0ccf6fecd8870

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-09-11T20:20:58
Monotone-Branch: ca.inverse.sogo

SoObjects/Contacts/SOGoContactGCSFolder.h

@@ -30,9 +30,6 @@
 @class NSString;
 
 @interface SOGoContactGCSFolder : SOGoFolder <SOGoContactFolder>
-{
-  NSString *displayName;
-}
 
 @end
 

SoObjects/Contacts/SOGoContactGCSFolder.m

@@ -41,47 +41,11 @@
 
 @implementation SOGoContactGCSFolder
 
-+ (id <SOGoContactFolder>) contactFolderWithName: (NSString *) aName
-                                  andDisplayName: (NSString *) aDisplayName
-                                     inContainer: (SOGoObject *) aContainer
-{
-  SOGoContactGCSFolder *folder;
-
-  folder = [[self alloc] initWithName: aName
-                         andDisplayName: aDisplayName
-                         inContainer: aContainer];
-  [folder autorelease];
-
-  return folder;
-}
-
-- (void) dealloc
-{
-  [displayName release];
-  [super dealloc];
-}
-
-- (id <SOGoContactFolder>) initWithName: (NSString *) newName
-                         andDisplayName: (NSString *) newDisplayName
-                            inContainer: (SOGoObject *) newContainer
-{
-  if ((self = [self initWithName: newName
-                    inContainer: newContainer]))
-    ASSIGN (displayName, newDisplayName);
-
-  return self;
-}
-
 - (BOOL) folderIsMandatory
 {
   return [nameInContainer isEqualToString: @"personal"];
 }
 
-- (NSString *) displayName
-{
-  return displayName;
-}
-
 /* name lookup */
 
 - (id <SOGoContactObject>) lookupContactWithId: (NSString *) recordId
@@ -105,7 +69,6 @@
   BOOL isPut;
 
   isPut = NO;
-  /* first check attributes directly bound to the application */
   obj = [super lookupName:_key inContext:_ctx acquire:NO];
   if (!obj)
     {
@@ -273,14 +236,6 @@
   return @"vcard-collection";
 }
 
-- (NSException *) delete
-{
-  return (([nameInContainer isEqualToString: @"personal"])
-	  ? [NSException exceptionWithHTTPStatus: 403
-			 reason: @"the 'personal' folder cannot be deleted"]
-	  : [super delete]);
-}
-
 // /* GET */
 
 // - (id) GETAction: (id)_ctx