diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2004-05-14 12:08:35 +0000 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2004-05-14 12:08:35 +0000 |
| commit | 9cb523cc5df4281c16110eb9863c9f2901051bae (patch) | |
| tree | 892124d7ce60a0006648d70c1cb4d2f753147635 | |
| parent | 101d77ffd04a9ee87dfc160a9b92bea77ddb78fa (diff) | |
| download | evolution-data-server-9cb523cc5df4281c16110eb9863c9f2901051bae.tar.gz | |
use the default timezone if we can't get timezones for the start and end
2004-05-14 Rodrigo Moya <rodrigo@ximian.com>
* libecal/e-cal-recur.c (e_cal_recur_generate_instances_of_rule):
use the default timezone if we can't get timezones for the start
and end dates.
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/libecal/e-cal-recur.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 6d5863f23..a2bffe4a6 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2004-05-14 Rodrigo Moya <rodrigo@ximian.com> + + * libecal/e-cal-recur.c (e_cal_recur_generate_instances_of_rule): + use the default timezone if we can't get timezones for the start + and end dates. + 2004-05-13 Rodrigo Moya <rodrigo@ximian.com> Fixes #54094 diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c index 94123a8cd..c705032a2 100644 --- a/calendar/libecal/e-cal-recur.c +++ b/calendar/libecal/e-cal-recur.c @@ -699,6 +699,8 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp, TZID (i.e. floating times) we use the default timezone. */ if (dtstart.tzid && !dtstart.value->is_date) { start_zone = (*tz_cb) (dtstart.tzid, tz_cb_data); + if (!start_zone) + start_zone = default_timezone; } else { start_zone = default_timezone; @@ -737,6 +739,8 @@ e_cal_recur_generate_instances_of_rule (ECalComponent *comp, if (dtend.tzid && !dtend.value->is_date) { end_zone = (*tz_cb) (dtend.tzid, tz_cb_data); + if (!end_zone) + end_zone = default_timezone; } else { end_zone = default_timezone; } |