diff options
| -rw-r--r-- | libical/ChangeLog | 7 | ||||
| -rw-r--r-- | libical/src/libical/icalcomponent.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog index a86513c7ab..8629b05d5b 100644 --- a/libical/ChangeLog +++ b/libical/ChangeLog @@ -1,6 +1,11 @@ 2001-07-03 Damon Chaplin <damon@ximian.com> - * src/libical/icaltimezone.c (icaltimezone_get_builtin_timezone_from_tzid): + * src/libical/icalcomponent.c (icalcomponent_merge_component): fixed + bad assertion, '!=' -> '=='. + (icalcomponent_merge_vtimezone): get the TZID from vtimezone, not comp. + +2001-07-03 Damon Chaplin <damon@ximian.com> + * src/libical/icaltime.c: * src/libical/icalcomponent.c: more timezone stuff. diff --git a/libical/src/libical/icalcomponent.c b/libical/src/libical/icalcomponent.c index 8c5295b79f..6cf5c899fe 100644 --- a/libical/src/libical/icalcomponent.c +++ b/libical/src/libical/icalcomponent.c @@ -1500,7 +1500,7 @@ void icalcomponent_merge_component(icalcomponent* comp, /* Check that both components are VCALENDAR components. */ assert (icalcomponent_isa(comp) == ICAL_VCALENDAR_COMPONENT); - assert (icalcomponent_isa(comp_to_merge) != ICAL_VCALENDAR_COMPONENT); + assert (icalcomponent_isa(comp_to_merge) == ICAL_VCALENDAR_COMPONENT); /* Step through each subcomponent of comp_to_merge, looking for VTIMEZONEs. For each VTIMEZONE found, check if we need to add it to comp and if we @@ -1559,7 +1559,7 @@ static void icalcomponent_merge_vtimezone (icalcomponent *comp, icaltimezone *existing_vtimezone; /* Get the TZID of the VTIMEZONE. */ - tzid_prop = icalcomponent_get_first_property (comp, ICAL_TZID_PROPERTY); + tzid_prop = icalcomponent_get_first_property (vtimezone, ICAL_TZID_PROPERTY); if (!tzid_prop) return; |