From ac87ef0695e9a1fcc6e54b2645d0991ddaddf882 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 11 Sep 2007 20:20:58 +0000
Subject: [PATCH] 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 |  3 --
 SoObjects/Contacts/SOGoContactGCSFolder.m | 45 -----------------------
 2 files changed, 48 deletions(-)

diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.h b/SoObjects/Contacts/SOGoContactGCSFolder.h
index 1dd91a53b..d10913d0b 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.h
+++ b/SoObjects/Contacts/SOGoContactGCSFolder.h
@@ -30,9 +30,6 @@
 @class NSString;
 
 @interface SOGoContactGCSFolder : SOGoFolder <SOGoContactFolder>
-{
-  NSString *displayName;
-}
 
 @end
 
diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
index 47eb5f13c..a3f603185 100644
--- a/SoObjects/Contacts/SOGoContactGCSFolder.m
+++ b/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