aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/print.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e07b4d297d..86f552bd32 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-11 Kidd Wang <kidd.wang@sun.com>
+
+ * gui/print.c: (print_date_label): guarantee we do have some timezone
+ before the time convertion.
+
2004-02-10 JP Rosevear <jpr@ximian.com>
* importers/icalendar-importer.c: remove useless include
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index b29934c09f..21bf5ccba5 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -2215,6 +2215,8 @@ print_date_label (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
e_cal_component_get_dtstart (comp, &datetime);
if (datetime.value) {
start_zone = get_zone_from_tzid (client, datetime.tzid);
+ if (!start_zone)
+ start_zone = calendar_config_get_icaltimezone ();
start = icaltime_as_timet_with_zone (*datetime.value,
start_zone);
}
@@ -2223,6 +2225,8 @@ print_date_label (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
e_cal_component_get_dtend (comp, &datetime);
if (datetime.value) {
end_zone = get_zone_from_tzid (client, datetime.tzid);
+ if (!end_zone)
+ end_zone = calendar_config_get_icaltimezone ();
end = icaltime_as_timet_with_zone (*datetime.value,
end_zone);
}
@@ -2231,6 +2235,8 @@ print_date_label (GnomePrintContext *pc, ECalComponent *comp, ECal *client,
e_cal_component_get_due (comp, &datetime);
if (datetime.value) {
due_zone = get_zone_from_tzid (client, datetime.tzid);
+ if (!due_zone)
+ due_zone = calendar_config_get_icaltimezone ();
due = icaltime_as_timet_with_zone (*datetime.value,
due_zone);
}