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

gcal_schedule_section_apply(): extract an _apply_to_event() helper function

Browse Source 
With this, there's no direct mutation of the self->event anywhere; the
_apply() function just uses self->event as a target for mutation
because that's what the surrounding architecture expects.

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 70173639e4
commit 939b60d6b4
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/event-editor/gcal-schedule-section.c
+20 -10
View File
@@ -471,17 +471,15 @@ gcal_schedule_section_set_event (GcalEventEditorSection *section,
} }
static void static void
gcal_schedule_section_apply (GcalEventEditorSection *section) gcal_schedule_section_apply_to_event (GcalScheduleSection *self,
GcalEvent *event)
{ {
GDateTime *start_date, *end_date; GDateTime *start_date, *end_date;
GcalRecurrenceFrequency freq; GcalRecurrenceFrequency freq;
GcalScheduleSection *self;
gboolean all_day; gboolean all_day;
GCAL_ENTRY; GCAL_ENTRY;
self = GCAL_SCHEDULE_SECTION (section);
all_day = all_day_selected (self); all_day = all_day_selected (self);
if (!all_day) if (!all_day)
@@ -505,7 +503,7 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
} }
#endif #endif
gcal_event_set_all_day (self->event, all_day); gcal_event_set_all_day (event, all_day);
/* /*
* The end date for multi-day events is exclusive, so we bump it by a day. * The end date for multi-day events is exclusive, so we bump it by a day.
@@ -519,8 +517,8 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
end_date = fake_end_date; end_date = fake_end_date;
} }
gcal_event_set_date_start (self->event, start_date); gcal_event_set_date_start (event, start_date);
gcal_event_set_date_end (self->event, end_date); gcal_event_set_date_end (event, end_date);
/* Check Repeat popover and set recurrence-rules accordingly */ /* Check Repeat popover and set recurrence-rules accordingly */
@@ -543,18 +541,30 @@ gcal_schedule_section_apply (GcalEventEditorSection *section)
if (!gcal_recurrence_is_equal (self->values->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 (event);
/* ... and set the new one */ /* ... and set the new one */
gcal_event_set_recurrence (self->event, recur); gcal_event_set_recurrence (event, recur);
} }
} }
else else
{ {
/* When NO_REPEAT is set, make sure to remove the old recurrent */ /* When NO_REPEAT is set, make sure to remove the old recurrent */
remove_recurrence_properties (self->event); remove_recurrence_properties (event);
} }
GCAL_EXIT;
}
static void
gcal_schedule_section_apply (GcalEventEditorSection *section)
{
GcalScheduleSection *self = GCAL_SCHEDULE_SECTION (section);
GCAL_ENTRY;
gcal_schedule_section_apply_to_event (self, self->event);
gcal_schedule_values_free (self->values); gcal_schedule_values_free (self->values);
self->values = gcal_schedule_values_from_event (self->event); self->values = gcal_schedule_values_from_event (self->event);