Make a note of the fact that we've hardcoded

[citadel.git] / citadel / ical_dezonify.c

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index 06fdb19a14918c97f94065cccf6371268bd217c5..d83cbc35be109b022ad324dc9c2bf8acdf70dd4e 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -27,6 +27,13 @@
 #include <ical.h>
 #include "ical_dezonify.h"
 
+
+/*
+ * Figure out which time zone needs to be used for timestamps that are
+ * not UTC and do not have a time zone specified.
+ *
+ * FIXME - most sites are not in New York :)
+ */
 icaltimezone *get_default_icaltimezone(void) {
 
         char *location = NULL;
@@ -34,11 +41,11 @@ icaltimezone *get_default_icaltimezone(void) {
 
         location = "America/New_York";
         if (location) {
-                zone = icaltimezone_get_builtin_timezone (location);
+                zone = icaltimezone_get_builtin_timezone(location);
         }
-        if (!zone)
-                zone = icaltimezone_get_utc_timezone ();
-
+        if (!zone) {
+                zone = icaltimezone_get_utc_timezone();
+       }
         return zone;
 }
 
@@ -94,6 +101,7 @@ void ical_dezonify_backend(icalcomponent *cal,
                return;
        }
 
+       lprintf(CTDL_DEBUG, "                * Was: %s\n", icaltime_as_ical_string(TheTime));
        if (TheTime.is_utc) {
                lprintf(CTDL_DEBUG, "                * This property is ALREADY UTC.\n");
        }
@@ -101,21 +109,24 @@ void ical_dezonify_backend(icalcomponent *cal,
                /* 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()
-                       );
                }
                else {
                        lprintf(CTDL_DEBUG, "                * Converting default timezone to UTC.\n");
-                       icaltimezone_convert_time(&TheTime,
-                                               get_default_icaltimezone(),
-                                               icaltimezone_get_utc_timezone()
-                       );
                }
+
+               if (t == NULL) {
+                       t = get_default_icaltimezone();
+               }
+
+               icaltimezone_convert_time(&TheTime,
+                                       t,
+                                       icaltimezone_get_utc_timezone()
+               );
                TheTime.is_utc = 1;
        }
+
        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
+       lprintf(CTDL_DEBUG, "                * Now: %s\n", icaltime_as_ical_string(TheTime));
 
        /* Now add the converted property back in. */
        if (icalproperty_isa(prop) == ICAL_DTSTART_PROPERTY) {