X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fical_dezonify.c;h=318a2ef631d5c2d7d4356755e823e8c5be51da83;hb=130ef6efcb903f2506ea1ab3b69906269bf34d10;hp=ccc46d4316960b04a6da35a35ac5523b585c010c;hpb=3cd022275187b434256d146914b9a07971821b9c;p=citadel.git

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index ccc46d431..318a2ef63 100644
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -79,14 +79,23 @@ void ical_dezonify_backend(icalcomponent *cal,
 		return;
 	}
 
-	/* Do the conversion. */
-	if (t != NULL) {
-		icaltimezone_convert_time(&TheTime,
-					t,
-					icaltimezone_get_utc_timezone()
-		);
+	if (TheTime.is_utc) {
+		lprintf(CTDL_DEBUG, "                * This property is ALREADY UTC.\n");
+	}
+	else {
+		/* Do the conversion. */
+		if (t != NULL) {
+			lprintf(CTDL_DEBUG, "                * Timezone prop found.  Converting to UTC.\n");
+			icaltimezone_convert_time(&TheTime,
+						t,
+						icaltimezone_get_utc_timezone()
+			);
+			TheTime.is_utc = 1;
+		}
+		else {
+			lprintf(CTDL_DEBUG, "                * Not UTC but no tzid found; WTF??\n");
+		}
 	}
-	TheTime.is_utc = 1;
 	icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
 
 	/* Now add the converted property back in. */
@@ -155,6 +164,8 @@ void ical_dezonify_recur(icalcomponent *cal, icalcomponent *rcal) {
 void ical_dezonify(icalcomponent *cal) {
 	icalcomponent *vt = NULL;
 
+	lprintf(CTDL_DEBUG, "ical_dezonify() started\n");
+
 	/* Convert all times to UTC */
 	ical_dezonify_recur(cal, cal);
 
@@ -165,6 +176,7 @@ void ical_dezonify(icalcomponent *cal) {
 		icalcomponent_free(vt);
 	}
 
+	lprintf(CTDL_DEBUG, "ical_dezonify() completed\n");
 }