From 46c6595c5101c8f523e67d5372cc8c1f0e877ede Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 30 Nov 2011 03:10:06 +0000
Subject: [PATCH] Monotone-Parent: f3c2aef97584736f86e933c6d26f36e424321aac
 Monotone-Revision: 4ef540dc6e51d77f7bceceddf7ba16238cd49b1a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-30T03:10:06
---
 ChangeLog                                      |  6 ++++++
 SoObjects/Appointments/SOGoAppointmentFolder.m | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab78d4d65..6bbbaf7d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-29  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	(-davCalendarTimeZone): fixed by embedding the VTIMEZONE element
+	in a VCALENDAR.
+
 2011-11-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 9b250a2ba..710ce5655 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -59,6 +59,7 @@
 #import <SOGo/NSDictionary+Utilities.h>
 #import <SOGo/NSObject+DAV.h>
 #import <SOGo/NSString+Utilities.h>
+#import <SOGo/SOGoBuild.h>
 #import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoPermissions.h>
@@ -1542,11 +1543,22 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
 {
   SOGoUser *ownerUser;
   NSString *ownerTimeZone;
+  iCalCalendar *tzCal;
+  iCalTimeZone *tz;
+  NSString *prodID;
 
   ownerUser = [SOGoUser userWithLogin: [self ownerInContext: context]];
   ownerTimeZone = [[ownerUser userDefaults] timeZoneName];
-  
-  return [[iCalTimeZone timeZoneForName: ownerTimeZone] versitString];
+  tz = [iCalTimeZone timeZoneForName: ownerTimeZone];
+
+  tzCal = [iCalCalendar groupWithTag: @"vcalendar"];
+  [tzCal setVersion: @"2.0"];
+  prodID = [NSString stringWithFormat:
+                       @"-//Inverse inc./SOGo %@//EN", SOGoVersion];
+  [tzCal setProdID: prodID];
+  [tzCal addChild: tz];
+
+  return [tzCal versitString];
 }
 
 - (NSException *) setDavCalendarTimeZone: (NSString *) newTimeZone