From b1ce8aef4421ea955d9fb29c5a01b4db873b8859 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 16 Jul 2009 17:35:40 +0000
Subject: [PATCH] Monotone-Parent: 6aaedc14bdf14bbd2d4349b28598b7e1458a51e4
 Monotone-Revision: cfddf3168ca9e0e98da2d0869ce40d9e369dc0cf

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-16T17:35:40
Monotone-Branch: ca.inverse.sogo
---
 .../Appointments/SOGoAppointmentFolder.m      |  8 ++++----
 SoObjects/SOGo/SOGoContentObject.m            | 20 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 9dd3cdd81..b506f19c6 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -1505,8 +1505,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 
   color = [[self calendarColor] uppercaseString];
 
-  return color;
-//   return [NSString stringWithFormat: @"%@FF", color];
+//   return color;
+  return [NSString stringWithFormat: @"%@FF", color];
 }
 
 - (NSException *) setDavCalendarColor: (NSString *) newColor
@@ -2239,8 +2239,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
       login = [[context activeUser] login];
       if ([login isEqualToString: [self ownerInContext: self]])
         {
-          [colType addObject: [NSArray arrayWithObjects: @"schedule-calendar",
-                                                         XMLNS_CALDAV, nil]];
+//           [colType addObject: [NSArray arrayWithObjects: @"schedule-calendar",
+//                                                          XMLNS_CALDAV, nil]];
           [colType addObject: [NSArray arrayWithObjects: @"schedule-inbox",
                                                          XMLNS_CALDAV, nil]];
           [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox",
diff --git a/SoObjects/SOGo/SOGoContentObject.m b/SoObjects/SOGo/SOGoContentObject.m
index 1fb428e9d..d90849a7c 100644
--- a/SoObjects/SOGo/SOGoContentObject.m
+++ b/SoObjects/SOGo/SOGoContentObject.m
@@ -371,20 +371,20 @@
 
 /* E-Tags */
 
-- (id) davEntityTag
-{
-  NSString *etag;
-
-  etag = [NSString stringWithFormat: @"<D:getetag>\"gcs%.8d\"</D:getetag>", version];
-
-  return [SOGoWebDAVValue valueForObject: etag attributes: nil];;
-}
-
 // - (id) davEntityTag
 // {
-//   return [NSString stringWithFormat: @"\"gcs%.8d\"", version];
+//   NSString *etag;
+
+//   etag = [NSString stringWithFormat: @"<D:getetag>\"gcs%.8d\"</D:getetag>", version];
+
+//   return [SOGoWebDAVValue valueForObject: etag attributes: nil];;
 // }
 
+- (id) davEntityTag
+{
+  return [NSString stringWithFormat: @"\"gcs%.8d\"", version];
+}
+
 /* WebDAV */
 - (NSString *) davCreationDate
 {