Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcal_schedule_section_apply(): use the stored values as a reference

Browse Source 
Also, update the values from the updated event at the end.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/550>
This commit is contained in:
Federico Mena Quintero
2025-08-27 19:59:16 -03:00
committed by Georges Basile Stavracas Neto
parent 68126bcfac
commit f51186c298
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/event-editor/gcal-schedule-section.c
+5 -3
View File
@@ -476,7 +476,6 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
GDateTime *start_date, *end_date; GDateTime *start_date, *end_date;
GcalRecurrenceFrequency freq; GcalRecurrenceFrequency freq;
GcalScheduleSection *self; GcalScheduleSection *self;
GcalRecurrence *old_recur;
gboolean all_day; gboolean all_day;
GCAL_ENTRY; GCAL_ENTRY;
@@ -524,7 +523,7 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
gcal_event_set_date_end (self->event, end_date); gcal_event_set_date_end (self->event, end_date);
/* Check Repeat popover and set recurrence-rules accordingly */ /* Check Repeat popover and set recurrence-rules accordingly */
old_recur = gcal_event_get_recurrence (self->event);
freq = adw_combo_row_get_selected (ADW_COMBO_ROW (self->repeat_combo)); freq = adw_combo_row_get_selected (ADW_COMBO_ROW (self->repeat_combo));
if (freq != GCAL_RECURRENCE_NO_REPEAT) if (freq != GCAL_RECURRENCE_NO_REPEAT)
@@ -541,7 +540,7 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
recur->limit.count = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (self->number_of_occurrences_spin)); recur->limit.count = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (self->number_of_occurrences_spin));
/* Only apply the new recurrence if it's different from the old one */ /* Only apply the new recurrence if it's different from the old one */
if (!gcal_recurrence_is_equal (old_recur, recur)) if (!gcal_recurrence_is_equal (self->values->recur, recur))
{ {
/* Remove the previous recurrence... */ /* Remove the previous recurrence... */
remove_recurrence_properties (self->event); remove_recurrence_properties (self->event);
@@ -556,6 +555,9 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
remove_recurrence_properties (self->event); remove_recurrence_properties (self->event);
} }
gcal_schedule_values_free (self->values);
self->values = gcal_schedule_values_from_event (self->event);
GCAL_EXIT; GCAL_EXIT;
} }