diff --git a/src/core/gcal-event.c b/src/core/gcal-event.c index 798027c3..aa8ba1eb 100644 --- a/src/core/gcal-event.c +++ b/src/core/gcal-event.c @@ -256,7 +256,7 @@ gcal_event_update_uid_internal (GcalEvent *self) ECalComponentId *id; const gchar *source_id; - /* Setup event uid */ + /* Set up event uid */ source_id = self->calendar ? gcal_calendar_get_id (self->calendar) : ""; id = e_cal_component_get_id (self->component); @@ -325,8 +325,8 @@ load_attendees (GcalEvent *self) } static gboolean -setup_component (GcalEvent *self, - GError **error) +set_up_component (GcalEvent *self, + GError **error) { g_autoptr (GTimeZone) zone_start = NULL; g_autoptr (GDateTime) date_start = NULL; @@ -340,7 +340,7 @@ setup_component (GcalEvent *self, g_assert (self->component != NULL); - /* Setup start date */ + /* Set up start date */ start = e_cal_component_get_dtstart (self->component); /* @@ -377,7 +377,7 @@ setup_component (GcalEvent *self, g_clear_object (&date); - /* Setup end date */ + /* Set up end date */ end = e_cal_component_get_dtend (self->component); if (end && e_cal_component_datetime_get_value (end)) @@ -400,7 +400,7 @@ setup_component (GcalEvent *self, self->dt_end = g_steal_pointer (&date_end); - /* Setup all day */ + /* Set up all day */ self->all_day = start_is_all_day && end_is_all_day; g_clear_object (&date); @@ -422,11 +422,11 @@ setup_component (GcalEvent *self, location = e_cal_component_get_location (self->component); gcal_event_set_location (self, location ? location : ""); - /* Setup description */ + /* Set up description */ description = gcal_util_get_desc_from_component (self->component, "\n\n"); gcal_event_set_description (self, description); - /* Setup UID */ + /* Set up UID */ gcal_event_update_uid_internal (self); /* Set has-recurrence to check if the component has recurrence or not */ @@ -435,15 +435,15 @@ setup_component (GcalEvent *self, /* Load the recurrence-rules in GcalRecurrence struct */ self->recurrence = gcal_recurrence_parse_recurrence_rules (self->component); - /* Load and setup the alarms */ + /* Load and set up the alarms */ load_alarms (self); - /* Load and setup organizer */ + /* Load and set up organizer */ organizer = e_cal_component_get_organizer (self->component); if (organizer) self->organizer = gcal_event_organizer_new (organizer); - /* load and setup attendees */ + /* load and set up attendees */ if (e_cal_component_has_attendees (self->component)) load_attendees (self); @@ -481,7 +481,7 @@ gcal_event_initable_init (GInitable *initable, { GcalEvent *self = GCAL_EVENT (initable); - return setup_component (self, error); + return set_up_component (self, error); } static void @@ -995,7 +995,7 @@ gcal_event_set_date_end (GcalEvent *self, { ECalComponentDateTime *component_dt; - /* Setup the ECalComponent's datetime value */ + /* Set up the ECalComponent's datetime value */ component_dt = build_component_from_datetime (self, dt); e_cal_component_set_dtend (self->component, component_dt); @@ -1041,7 +1041,7 @@ gcal_event_set_date_start (GcalEvent *self, { ECalComponentDateTime *component_dt; - /* Setup the ECalComponent's datetime value */ + /* Set up the ECalComponent's datetime value */ component_dt = build_component_from_datetime (self, dt); e_cal_component_set_dtstart (self->component, component_dt); diff --git a/src/gui/calendar-management/gcal-edit-calendar-page.c b/src/gui/calendar-management/gcal-edit-calendar-page.c index e47449cf..495a4df5 100644 --- a/src/gui/calendar-management/gcal-edit-calendar-page.c +++ b/src/gui/calendar-management/gcal-edit-calendar-page.c @@ -112,8 +112,8 @@ is_remote_source (ESource *source) } static void -setup_calendar (GcalEditCalendarPage *self, - GcalCalendar *calendar) +set_up_calendar (GcalEditCalendarPage *self, + GcalCalendar *calendar) { ESource *source; gboolean is_remote; @@ -402,7 +402,7 @@ gcal_edit_calendar_page_activate (GcalCalendarManagementPage *page, { GCAL_ENTRY; - setup_calendar (GCAL_EDIT_CALENDAR_PAGE (page), calendar); + set_up_calendar (GCAL_EDIT_CALENDAR_PAGE (page), calendar); GCAL_EXIT; } diff --git a/src/gui/event-editor/gcal-alarm-row.c b/src/gui/event-editor/gcal-alarm-row.c index 4e61ad2f..f8cadea6 100644 --- a/src/gui/event-editor/gcal-alarm-row.c +++ b/src/gui/event-editor/gcal-alarm-row.c @@ -202,7 +202,7 @@ format_alarm_duration (ICalDuration *duration) } static void -setup_alarm (GcalAlarmRow *self) +set_up_alarm (GcalAlarmRow *self) { g_autofree gchar *formatted_duration = NULL; ECalComponentAlarmTrigger *trigger; @@ -274,7 +274,7 @@ gcal_alarm_row_set_property (GObject *object, case PROP_ALARM: g_assert (self->alarm == NULL); self->alarm = e_cal_component_alarm_copy (g_value_get_pointer (value)); - setup_alarm (self); + set_up_alarm (self); break; default: diff --git a/src/gui/event-editor/gcal-attendee-row.c b/src/gui/event-editor/gcal-attendee-row.c index 619e098b..d5d72b9d 100644 --- a/src/gui/event-editor/gcal-attendee-row.c +++ b/src/gui/event-editor/gcal-attendee-row.c @@ -83,7 +83,7 @@ show_context_menu (GcalAttendeeRow *self, } static void -setup_row_title_and_subtitle (GcalAttendeeRow *self) +set_up_row_title_and_subtitle (GcalAttendeeRow *self) { g_autoptr (GString) title = NULL; g_autoptr (GString) subtitle = NULL; @@ -114,9 +114,9 @@ setup_row_title_and_subtitle (GcalAttendeeRow *self) } static void -setup_row_content (GcalAttendeeRow *self) +set_up_row_content (GcalAttendeeRow *self) { - setup_row_title_and_subtitle (self); + set_up_row_title_and_subtitle (self); /* set role */ if (gcal_event_attendee_get_role (self->attendee) == GCAL_EVENT_ATTENDEE_ROLE_OPTIONAL) @@ -163,7 +163,7 @@ gcal_attendee_row_set_property (GObject *object, case PROP_ATTENDEE: g_assert (self->attendee == NULL); self->attendee = g_value_get_object (value); - setup_row_content (self); + set_up_row_content (self); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); diff --git a/src/gui/event-editor/gcal-attendee-summary-row.c b/src/gui/event-editor/gcal-attendee-summary-row.c index de775dfc..e1898f98 100644 --- a/src/gui/event-editor/gcal-attendee-summary-row.c +++ b/src/gui/event-editor/gcal-attendee-summary-row.c @@ -121,8 +121,8 @@ build_summary_subtitle (GcalAttendeeSummaryRow *self) } static void -setup_filtered_attendees (GcalAttendeeSummaryRow *self, - GListModel *attendees) +set_up_filtered_attendees (GcalAttendeeSummaryRow *self, + GListModel *attendees) { g_return_if_fail (GCAL_IS_ATTENDEE_SUMMARY_ROW (self)); @@ -191,7 +191,7 @@ gcal_attendee_summary_row_set_property (GObject *object, switch (property_id) { case PROP_ATTENDEES: - setup_filtered_attendees (self, g_value_get_object (value)); + set_up_filtered_attendees (self, g_value_get_object (value)); break; case PROP_FILTER_FLAGS: change_attendee_filter_type (self, g_value_get_flags (value)); diff --git a/src/gui/event-editor/gcal-reminders-section.c b/src/gui/event-editor/gcal-reminders-section.c index e1574973..b3041c03 100644 --- a/src/gui/event-editor/gcal-reminders-section.c +++ b/src/gui/event-editor/gcal-reminders-section.c @@ -163,8 +163,8 @@ create_alarm_row (GcalRemindersSection *self, } static void -setup_alarms (GcalRemindersSection *self, - GcalEvent *event) +set_up_alarms (GcalRemindersSection *self, + GcalEvent *event) { g_autoptr (GList) alarms = NULL; GList *l; @@ -332,7 +332,7 @@ gcal_reminders_section_event_set_cb (GcalEventEditorSection *section, { GcalRemindersSection *self = GCAL_REMINDERS_SECTION (section); - setup_alarms (self, event); + set_up_alarms (self, event); } diff --git a/src/gui/gcal-event-popover.c b/src/gui/gcal-event-popover.c index 997cf177..86f0b34d 100644 --- a/src/gui/gcal-event-popover.c +++ b/src/gui/gcal-event-popover.c @@ -452,7 +452,7 @@ add_meeting (GcalEventPopover *self, } static void -setup_location_label (GcalEventPopover *self) +set_up_location_label (GcalEventPopover *self) { g_autoptr (GUri) guri = NULL; g_autofree gchar *location = NULL; @@ -485,7 +485,7 @@ setup_location_label (GcalEventPopover *self) } static void -setup_description_label (GcalEventPopover *self) +set_up_description_label (GcalEventPopover *self) { g_autofree gchar *description = NULL; g_autofree gchar *meeting_url = NULL; @@ -514,8 +514,8 @@ set_event_internal (GcalEventPopover *self, gtk_label_set_label (self->summary_label, gcal_event_get_summary (event)); - setup_description_label (self); - setup_location_label (self); + set_up_description_label (self); + set_up_location_label (self); update_placeholder_label (self); update_date_time_label (self); update_decorations (self, event); diff --git a/src/gui/gcal-meeting-row.c b/src/gui/gcal-meeting-row.c index cab9ab42..928885e2 100644 --- a/src/gui/gcal-meeting-row.c +++ b/src/gui/gcal-meeting-row.c @@ -60,7 +60,7 @@ static GParamSpec *properties[N_PROPS] = { NULL, }; */ static void -setup_meeting (GcalMeetingRow *self) +set_up_meeting (GcalMeetingRow *self) { g_autofree gchar *markup_url = NULL; @@ -144,7 +144,7 @@ gcal_meeting_row_set_property (GObject *object, case PROP_URL: g_assert (self->url == NULL); self->url = g_value_dup_string (value); - setup_meeting (self); + set_up_meeting (self); break; default: diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c index 2107500f..c115c59e 100644 --- a/src/gui/gcal-window.c +++ b/src/gui/gcal-window.c @@ -857,7 +857,7 @@ show_new_event_widget (GcalView *view, g_debug ("Quick add popover position (%f, %f)", x, y); - /* Setup the quick add popover's dates */ + /* Set up the quick add popover's dates */ gcal_quick_add_popover_set_range (GCAL_QUICK_ADD_POPOVER (window->quick_add_popover), window->event_creation_data->range); @@ -1467,7 +1467,7 @@ gcal_window_init (GcalWindow *self) {"undo-delete-event", on_window_undo_delete_event_cb }, }; - /* Setup actions */ + /* Set up actions */ g_action_map_add_action_entries (G_ACTION_MAP (self), actions, G_N_ELEMENTS (actions), diff --git a/src/gui/importer/gcal-import-dialog.c b/src/gui/importer/gcal-import-dialog.c index b3ce2f49..e80a1ec2 100644 --- a/src/gui/importer/gcal-import-dialog.c +++ b/src/gui/importer/gcal-import-dialog.c @@ -100,7 +100,7 @@ update_default_calendar (GcalImportDialog *self) } static void -setup_calendars (GcalImportDialog *self) +set_up_calendars (GcalImportDialog *self) { GcalContext *context = gcal_application_get_context (GCAL_DEFAULT_APPLICATION); g_autoptr (GListModel) calendars = NULL; @@ -149,9 +149,9 @@ add_file (GcalImportDialog *self, } static void -setup_files (GcalImportDialog *self, - GFile **files, - gint n_files) +set_up_files (GcalImportDialog *self, + GFile **files, + gint n_files) { gint i; @@ -165,8 +165,8 @@ setup_files (GcalImportDialog *self, } static void -setup_files_list (GcalImportDialog *self, - GList *list) +set_up_files_list (GcalImportDialog *self, + GList *list) { gint n_files = 0; gboolean has_multiple = list->next != NULL; @@ -348,7 +348,7 @@ gcal_import_dialog_constructed (GObject *object) G_OBJECT_CLASS (gcal_import_dialog_parent_class)->constructed (object); - setup_calendars (self); + set_up_calendars (self); } static void @@ -405,7 +405,7 @@ gcal_import_dialog_new_for_files (GFile **files, self = g_object_new (GCAL_TYPE_IMPORT_DIALOG, NULL); - setup_files (self, files, n_files); + set_up_files (self, files, n_files); return GTK_WIDGET (self); } @@ -418,7 +418,7 @@ gcal_import_dialog_new_for_file_list (GList *file_list) self = g_object_new (GCAL_TYPE_IMPORT_DIALOG, NULL); - setup_files_list (self, file_list); + set_up_files_list (self, file_list); return GTK_WIDGET (self); } diff --git a/src/gui/importer/gcal-import-file-row.c b/src/gui/importer/gcal-import-file-row.c index 80b6f799..742b8b96 100644 --- a/src/gui/importer/gcal-import-file-row.c +++ b/src/gui/importer/gcal-import-file-row.c @@ -269,7 +269,7 @@ filter_timezones (ICalComponent *component) } static void -setup_file (GcalImportFileRow *self) +set_up_file (GcalImportFileRow *self) { gcal_importer_import_file (self->file, self->cancellable, @@ -362,7 +362,7 @@ gcal_import_file_row_set_property (GObject *object, case PROP_FILE: g_assert (self->file == NULL); self->file = g_value_dup_object (value); - setup_file (self); + set_up_file (self); break; default: diff --git a/src/gui/views/gcal-month-view-row.c b/src/gui/views/gcal-month-view-row.c index b1204819..fd5cff13 100644 --- a/src/gui/views/gcal-month-view-row.c +++ b/src/gui/views/gcal-month-view-row.c @@ -473,8 +473,8 @@ layout_block_free (gpointer data) } static void -setup_child_widget (GcalMonthViewRow *self, - GtkWidget *widget) +set_up_child_widget (GcalMonthViewRow *self, + GtkWidget *widget) { gtk_widget_insert_after (widget, GTK_WIDGET (self), self->day_cells[GCAL_N_WEEKDAYS - 1]); @@ -787,7 +787,7 @@ recalculate_layout_blocks (GcalMonthViewRow *self) g_assert (GCAL_IS_EVENT_WIDGET (event_widget)); - setup_child_widget (self, event_widget); + set_up_child_widget (self, event_widget); } if (!gcal_event_get_all_day (event) && !gcal_event_is_multiday (event)) diff --git a/src/gui/views/gcal-week-grid.c b/src/gui/views/gcal-week-grid.c index 050fa4da..d00baf68 100644 --- a/src/gui/views/gcal-week-grid.c +++ b/src/gui/views/gcal-week-grid.c @@ -718,7 +718,7 @@ move_event_to_cell (GcalWeekGrid *self, gcal_event_set_all_day (changed_event, FALSE); gcal_event_set_date_start (changed_event, dnd_date); - /* Setup the new end date */ + /* Set up the new end date */ new_end = g_date_time_add (dnd_date, timespan); gcal_event_set_date_end (changed_event, new_end); @@ -1120,7 +1120,7 @@ gcal_week_grid_size_allocate (GtkWidget *widget, x = width - (x + event_width); y = (g_date_time_get_hour (event_start) * 60 + g_date_time_get_minute (event_start)) * minutes_height; - /* Setup the child position and size */ + /* Set up the child position and size */ child_allocation.x = x; child_allocation.y = y; child_allocation.width = event_width; diff --git a/src/gui/views/gcal-week-header.c b/src/gui/views/gcal-week-header.c index 1839b478..6839bc1a 100644 --- a/src/gui/views/gcal-week-header.c +++ b/src/gui/views/gcal-week-header.c @@ -248,8 +248,8 @@ on_event_widget_activated (GcalEventWidget *widget, static inline void -setup_event_widget (GcalWeekHeader *self, - GtkWidget *widget) +set_up_event_widget (GcalWeekHeader *self, + GtkWidget *widget) { g_signal_connect_object (widget, "activate", G_CALLBACK (on_event_widget_activated), self, 0); } @@ -512,7 +512,7 @@ merge_events (GcalWeekHeader *self, GDateTime *end_date; gint deleted_width, current_width; - /* Setup the new end date of the merged event */ + /* Set up the new end date of the merged event */ end_date = gcal_event_widget_get_date_end (GCAL_EVENT_WIDGET (to_be_removed)); gcal_event_widget_set_date_end (GCAL_EVENT_WIDGET (event), end_date); @@ -657,7 +657,7 @@ split_event_widget_at_column (GcalWeekHeader *self, gcal_event_widget_set_date_end (GCAL_EVENT_WIDGET (widget_before), column_date); - setup_event_widget (self, widget_before); + set_up_event_widget (self, widget_before); gtk_grid_attach (self->grid, widget_before, @@ -694,7 +694,7 @@ split_event_widget_at_column (GcalWeekHeader *self, gcal_event_widget_set_date_start (GCAL_EVENT_WIDGET (widget_after), end_column_date); gcal_event_widget_set_date_end (GCAL_EVENT_WIDGET (widget_after), event_end); - setup_event_widget (self, widget_after); + set_up_event_widget (self, widget_after); gtk_grid_attach (self->grid, widget_after, @@ -804,7 +804,7 @@ add_event_to_grid (GcalWeekHeader *self, /* Add the event to the grid */ widget = gcal_event_widget_pool_take_or_create (self->event_widget_pool, event); g_assert (GCAL_IS_EVENT_WIDGET (widget)); - setup_event_widget (self, widget); + set_up_event_widget (self, widget); gtk_grid_attach (self->grid, widget, @@ -813,7 +813,7 @@ add_event_to_grid (GcalWeekHeader *self, 1, 1); - /* Setup event visibility */ + /* Set up event visibility */ is_visible = is_event_visible (self, start, position); gtk_widget_set_visible (widget, is_visible); @@ -868,7 +868,7 @@ add_event_to_grid (GcalWeekHeader *self, cloned_widget = gcal_event_widget_pool_take_or_create (self->event_widget_pool, event); g_assert (GCAL_IS_EVENT_WIDGET (cloned_widget)); - setup_event_widget (self, cloned_widget); + set_up_event_widget (self, cloned_widget); gtk_grid_attach (self->grid, cloned_widget, diff --git a/src/search/gcal-search-engine.c b/src/search/gcal-search-engine.c index aaae8cb5..97f6d24d 100644 --- a/src/search/gcal-search-engine.c +++ b/src/search/gcal-search-engine.c @@ -112,7 +112,7 @@ gcal_search_engine_constructed (GObject *object) G_OBJECT_CLASS (gcal_search_engine_parent_class)->constructed (object); - /* Setup the data model */ + /* Set up the data model */ self->timeline = gcal_timeline_new (); context = gcal_application_get_context (GCAL_DEFAULT_APPLICATION); diff --git a/src/utils/gcal-source-discoverer.c b/src/utils/gcal-source-discoverer.c index f0b383ba..0b331ea0 100644 --- a/src/utils/gcal-source-discoverer.c +++ b/src/utils/gcal-source-discoverer.c @@ -187,7 +187,7 @@ create_discovered_source (ESource *source, if (user_addresses) e_source_webdav_set_email_address (webdav, user_addresses->data); - /* Setup the color */ + /* Set up the color */ selectable = e_source_get_extension (new_source, E_SOURCE_EXTENSION_CALENDAR); e_source_selectable_set_color (selectable, discovered_source->color);