[evolution-data-server] I#169 - Detached instances shown as with floating time ][
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] I#169 - Detached instances shown as with floating time ][
- Date: Thu, 24 Oct 2019 13:01:18 +0000 (UTC)
commit eb511212a54309e42cb454f8b54c4bd4174aee1a
Author: Milan Crha <mcrha redhat com>
Date: Thu Oct 24 15:01:49 2019 +0200
I#169 - Detached instances shown as with floating time ][
Missed a check for non-NULL tzid on the DTEND.
Related to https://gitlab.gnome.org/GNOME/evolution-data-server/issues/169
src/calendar/libecal/e-cal-client.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/src/calendar/libecal/e-cal-client.c b/src/calendar/libecal/e-cal-client.c
index 30cc5ca1c..d4f6246cf 100644
--- a/src/calendar/libecal/e-cal-client.c
+++ b/src/calendar/libecal/e-cal-client.c
@@ -2448,14 +2448,16 @@ generate_instances (ECalClient *client,
}
if (dtend && e_cal_component_datetime_get_value (dtend)) {
- ICalTimezone *zone;
-
ci->end = i_cal_time_clone (e_cal_component_datetime_get_value (dtend));
- zone = e_cal_client_tzlookup_cb (e_cal_component_datetime_get_tzid (dtend),
client, NULL, NULL);
+ if (e_cal_component_datetime_get_tzid (dtend)) {
+ ICalTimezone *zone;
- if (zone)
- i_cal_time_set_timezone (ci->end, zone);
+ zone = e_cal_client_tzlookup_cb (e_cal_component_datetime_get_tzid
(dtend), client, NULL, NULL);
+
+ if (zone)
+ i_cal_time_set_timezone (ci->end, zone);
+ }
} else {
ci->end = i_cal_time_clone (ci->start);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]