aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/comp-editor-factory.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d0e8b004dd..34064fb1b2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-04 Damon Chaplin <damon@ximian.com>
+
+ * gui/comp-editor-factory.c (get_default_component): use TZID from the
+ builtin timezone, instead of using the location name.
+
2001-11-02 Federico Mena Quintero <federico@ximian.com>
* cal-util/cal-util.c (compute_alarm_range): Short-circuit the
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index 44f68c4e83..928c50f937 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -353,13 +353,17 @@ get_default_component (CalComponentVType vtype)
if (vtype == CAL_COMPONENT_EVENT) {
struct icaltimetype itt;
CalComponentDateTime dt;
+ char *location;
+ icaltimezone *zone;
comp = cal_comp_event_new_with_defaults ();
itt = icaltime_today ();
dt.value = &itt;
- dt.tzid = calendar_config_get_timezone ();
+ location = calendar_config_get_timezone ();
+ zone = icaltimezone_get_builtin_timezone (location);
+ dt.tzid = icaltimezone_get_tzid (zone);
cal_component_set_dtstart (comp, &dt);
cal_component_set_dtend (comp, &dt);