From db46c4e1a5993792417e915fe60a820a2a678961 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 2 Nov 2011 18:18:32 +0000
Subject: [PATCH] Monotone-Parent: 3e37d64800faf93e948c9831e2985ae7f4da314a
 Monotone-Revision: c376ff04c7ac6aed511caec05718166c8170cc7c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-11-02T18:18:32
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                             |  1 +
 OpenChange/MAPIStoreCalendarMessage.m | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index baee5b509..0725d6235 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* OpenChange/MAPIStoreCalendarMessage.m (-save): handle all day
 	events based on the value of PidLidAppointmentSubType.
+	Don't add the timezone component to the vCalendar in that case.
 
 2011-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
diff --git a/OpenChange/MAPIStoreCalendarMessage.m b/OpenChange/MAPIStoreCalendarMessage.m
index 07a34ee52..214f1c76d 100644
--- a/OpenChange/MAPIStoreCalendarMessage.m
+++ b/OpenChange/MAPIStoreCalendarMessage.m
@@ -712,14 +712,17 @@
       if (value)
         [newEvent setLocation: value];
 
-      tzName = [[self ownerTimeZone] name];
-      tz = [iCalTimeZone timeZoneForName: tzName];
-      [vCalendar addTimeZone: tz];
-
       isAllDay = [[properties
                     objectForKey: MAPIPropertyKey (PidLidAppointmentSubType)]
                    boolValue];
 
+      if (!isAllDay)
+        {
+          tzName = [[self ownerTimeZone] name];
+          tz = [iCalTimeZone timeZoneForName: tzName];
+          [vCalendar addTimeZone: tz];
+        }
+
       // start
       value = [properties objectForKey: MAPIPropertyKey (PR_START_DATE)];
       if (!value)