From e71b493b4aac925f7349ed01e35963e539e7291a Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 7 Mar 2008 22:14:44 +0000
Subject: [PATCH] Monotone-Parent: 16ddf3bffae0279bac86bf214c2a15cff134e2e9
 Monotone-Revision: d253d04eddd673d2fda2f03ca664a7fc15cf7455

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-03-07T22:14:44
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                      |  4 ++++
 SoObjects/Appointments/SOGoAppointmentFolder.m |  7 +------
 SoObjects/SOGo/SOGoFolder.h                    |  2 ++
 SoObjects/SOGo/SOGoFolder.m                    | 10 +++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4438de65d..627cb1bff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoFolder.m ([SOGoFolder
+	-isValidContentName:name]): moved method from
+	SOGoAppointmentFolder's isValidAppointmentName.
+
 	* SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder -objectClassForContent:content])
 	([SOGoContactGCSFolder -deduceObjectForName:inContext:])
 	([SOGoContactGCSFolder -requestNamedIsHandledLater:name])
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 745e312c4..6491a3537 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -150,11 +150,6 @@ static NSNumber   *sharedYes = nil;
 
 /* name lookup */
 
-- (BOOL) isValidAppointmentName: (NSString *)_key
-{
-  return ([_key length] != 0);
-}
-
 - (void) appendObject: (NSDictionary *) object
           withBaseURL: (NSString *) baseURL
      toREPORTResponse: (WOResponse *) r
@@ -391,7 +386,7 @@ static NSNumber   *sharedYes = nil;
       obj = [super lookupName:_key inContext:_ctx acquire:NO];
       if (!obj)
         {
-	  if ([self isValidAppointmentName:_key])
+	  if ([self isValidContentName:_key])
             {
               url = [[[_ctx request] uri] urlWithoutParameters];
               if ([url hasSuffix: @"AsTask"])
diff --git a/SoObjects/SOGo/SOGoFolder.h b/SoObjects/SOGo/SOGoFolder.h
index 69951d955..03f1c934f 100644
--- a/SoObjects/SOGo/SOGoFolder.h
+++ b/SoObjects/SOGo/SOGoFolder.h
@@ -36,6 +36,8 @@
 - (NSString *) folderType;
 - (NSArray *) fetchContentObjectNames;
 
+- (BOOL) isValidContentName: (NSString *) name;
+
 /* sorting */
 - (NSComparisonResult) compare: (id) otherFolder;
 
diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m
index 3f404fdf9..b01bfe5a5 100644
--- a/SoObjects/SOGo/SOGoFolder.m
+++ b/SoObjects/SOGo/SOGoFolder.m
@@ -112,6 +112,11 @@
   return [NSArray array];
 }
 
+- (BOOL) isValidContentName: (NSString *) name
+{
+  return ([name length] > 0);
+}
+
 - (BOOL) isFolderish
 {
   return YES;
@@ -201,11 +206,6 @@
 
 /* WebDAV */
 
-- (BOOL) davIsCollection
-{
-  return [self isFolderish];
-}
-
 - (NSString *) davContentType
 {
   return @"httpd/unix-directory";