summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2023-03-14 17:51:07 +0100
committerMilan Crha <mcrha@redhat.com>2023-03-17 09:48:01 +0100
commit165546796e4bfa50112056ae5a277f06483cd2ba (patch)
tree37e90c0927ae140eea5263548b8cbd4f816d3bd9
parent3d56456575cc698f0322a9c9aaf984c090c23596 (diff)
downloadevolution-data-server-165546796e4bfa50112056ae5a277f06483cd2ba.tar.gz
M!119 - Calendar: Change file backend discard_alarm() function
No need to create new detached instances when discarding an alarm, better to update the main component with the new acknowledge date/time. Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/119
-rw-r--r--src/calendar/backends/file/e-cal-backend-file.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
index 86628dac0..bcc55e5da 100644
--- a/src/calendar/backends/file/e-cal-backend-file.c
+++ b/src/calendar/backends/file/e-cal-backend-file.c
@@ -2888,17 +2888,10 @@ e_cal_backend_file_discard_alarm_sync (ECalBackendSync *backend,
if (comp) {
g_object_ref (comp);
} else if (obj_data->full_object) {
- ICalComponent *icomp;
- ICalTime *itt;
-
- itt = i_cal_time_new_from_string (rid);
- icomp = e_cal_util_construct_instance (
- e_cal_component_get_icalcomponent (obj_data->full_object),
- itt);
- g_object_unref (itt);
-
- if (icomp)
- comp = e_cal_component_new_from_icalcomponent (icomp);
+ /* if there's no detached instance, modify the main component without
+ creating a new detached instance only for the acknowledge date/time */
+ comp = g_object_ref (obj_data->full_object);
+ rid = NULL;
}
} else if (obj_data->full_object) {
comp = g_object_ref (obj_data->full_object);