Use get_recurrence_frequency() in all places
Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/550>
This commit is contained in:
committed by
Georges Basile Stavracas Neto
parent
ffd66ff084
commit
05fed3d9c6
@@ -634,9 +634,9 @@ on_repeat_duration_changed_cb (GtkWidget *widget,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static GcalRecurrenceFrequency
|
static GcalRecurrenceFrequency
|
||||||
get_recurrence_frequency (AdwComboRow *row)
|
get_recurrence_frequency (GcalScheduleSection *self)
|
||||||
{
|
{
|
||||||
guint item = adw_combo_row_get_selected (row);
|
guint item = adw_combo_row_get_selected (ADW_COMBO_ROW (self->repeat_combo));
|
||||||
|
|
||||||
g_assert (item >= GCAL_RECURRENCE_NO_REPEAT && item <= GCAL_RECURRENCE_OTHER);
|
g_assert (item >= GCAL_RECURRENCE_NO_REPEAT && item <= GCAL_RECURRENCE_OTHER);
|
||||||
|
|
||||||
@@ -648,7 +648,7 @@ on_repeat_type_changed_cb (GtkWidget *widget,
|
|||||||
GParamSpec *pspec,
|
GParamSpec *pspec,
|
||||||
GcalScheduleSection *self)
|
GcalScheduleSection *self)
|
||||||
{
|
{
|
||||||
GcalRecurrenceFrequency frequency = get_recurrence_frequency (ADW_COMBO_ROW (widget));
|
GcalRecurrenceFrequency frequency = get_recurrence_frequency (self);
|
||||||
|
|
||||||
if (frequency == GCAL_RECURRENCE_NO_REPEAT)
|
if (frequency == GCAL_RECURRENCE_NO_REPEAT)
|
||||||
adw_combo_row_set_selected (ADW_COMBO_ROW (self->repeat_duration_combo), GCAL_RECURRENCE_FOREVER);
|
adw_combo_row_set_selected (ADW_COMBO_ROW (self->repeat_duration_combo), GCAL_RECURRENCE_FOREVER);
|
||||||
@@ -728,7 +728,7 @@ gcal_schedule_section_apply_to_event (GcalScheduleSection *self,
|
|||||||
|
|
||||||
/* Check Repeat popover and set recurrence-rules accordingly */
|
/* Check Repeat popover and set recurrence-rules accordingly */
|
||||||
|
|
||||||
freq = adw_combo_row_get_selected (ADW_COMBO_ROW (self->repeat_combo));
|
freq = get_recurrence_frequency (self);
|
||||||
|
|
||||||
if (freq != GCAL_RECURRENCE_NO_REPEAT)
|
if (freq != GCAL_RECURRENCE_NO_REPEAT)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user