From: Art Cancro <ajc@citadel.org>
Date: Wed, 3 Dec 2008 18:53:48 +0000 (+0000)
Subject: * When encapsulating a VEVENT into a full VCALENDAR
X-Git-Tag: v7.86~1746
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=2bf2faa6b02e497fa0358428b15e924171a6c555;p=citadel.git

* When encapsulating a VEVENT into a full VCALENDAR
  component, all TZID's referenced in timestamps are now also
  encapsulated into the VCALENDAR component, making the component
  fully portable across time zones.  The sun is shining, birds are
  chirping, free ice cream is being distributed on streetcorners, and
  things are just generally good all around.  For now.
---

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 9f846457b..21b8e063f 100644
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -281,7 +281,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
 				}
 
 				icalproperty_set_parameter(p,
-					icalparameter_new_tzid(icaltimezone_get_location((icaltimezone *)z))
+					icalparameter_new_tzid(icaltimezone_get_tzid((icaltimezone *)z))
 				);
 			}
 		}
@@ -303,8 +303,7 @@ icalcomponent *ical_encapsulate_subcomponent(icalcomponent *subcomp) {
 	/* Attach any timezones we need */
 	if (num_zones_attached > 0) for (i=0; i<num_zones_attached; ++i) {
 		icalcomponent *zc;
-		zc = icalcomponent_new_vtimezone();
-		/* FIXME actually put something in here!!!! */
+		zc = icalcomponent_new_clone(icaltimezone_get_component((icaltimezone *)attached_zones[i]));
 		icalcomponent_add_component(encaps, zc);
 	}