utils: Prefix every function with gcal_util_
Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/842>
This commit is contained in:
@@ -64,7 +64,7 @@ on_copy_email_cb (GSimpleAction *action,
|
||||
GdkClipboard *clipboard = gdk_display_get_clipboard (display);
|
||||
|
||||
g_autofree const gchar *email =
|
||||
gcal_get_email_from_mailto_uri (gcal_event_attendee_get_uri (self->attendee));
|
||||
gcal_util_get_email_from_mailto_uri (gcal_event_attendee_get_uri (self->attendee));
|
||||
|
||||
gdk_clipboard_set_text (clipboard, email);
|
||||
}
|
||||
@@ -90,7 +90,7 @@ setup_row_title_and_subtitle (GcalAttendeeRow *self)
|
||||
|
||||
/* this is the initial line for both cases */
|
||||
title = g_string_new (gcal_event_attendee_get_name (self->attendee));
|
||||
g_autofree const gchar *delegator_email = gcal_get_email_from_mailto_uri (gcal_event_attendee_get_uri (self->attendee));
|
||||
g_autofree const gchar *delegator_email = gcal_util_get_email_from_mailto_uri (gcal_event_attendee_get_uri (self->attendee));
|
||||
|
||||
if (gcal_event_attendee_get_part_status (self->attendee) != GCAL_EVENT_ATTENDEE_PART_DELEGATED)
|
||||
{
|
||||
@@ -104,7 +104,7 @@ setup_row_title_and_subtitle (GcalAttendeeRow *self)
|
||||
if (delegator_email)
|
||||
g_string_append_printf (title, " (%s)", delegator_email);
|
||||
|
||||
g_autofree const gchar *delegated_to = gcal_get_email_from_mailto_uri (gcal_event_attendee_get_delegated_to (self->attendee));
|
||||
g_autofree const gchar *delegated_to = gcal_util_get_email_from_mailto_uri (gcal_event_attendee_get_delegated_to (self->attendee));
|
||||
subtitle = g_string_new (gettext ("Delegated to: "));
|
||||
g_string_append (subtitle, delegated_to);
|
||||
}
|
||||
|
||||
@@ -111,7 +111,7 @@ validate (GcalEventEditorDialog *self)
|
||||
|
||||
event_name = gcal_event_get_summary (self->edited_event);
|
||||
|
||||
gtk_widget_action_set_enabled (GTK_WIDGET (self), "event-editor.save", gcal_is_valid_event_name (event_name));
|
||||
gtk_widget_action_set_enabled (GTK_WIDGET (self), "event-editor.save", gcal_util_is_valid_event_name (event_name));
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -252,7 +252,7 @@ set_up_context (GcalEventEditorDialog *self)
|
||||
|
||||
context = gcal_application_get_context (GCAL_DEFAULT_APPLICATION);
|
||||
manager = gcal_context_get_manager (context);
|
||||
writable_calendars = gcal_create_writable_calendars_model (manager);
|
||||
writable_calendars = gcal_util_create_writable_calendars_model (manager);
|
||||
|
||||
self->read_only_calendar_model = g_list_store_new (GCAL_TYPE_CALENDAR);
|
||||
|
||||
@@ -310,11 +310,11 @@ save_event (GcalEventEditorDialog *self,
|
||||
|
||||
if (gcal_event_has_recurrence (self->event) && gcal_event_has_recurrence (self->edited_event))
|
||||
{
|
||||
gcal_utils_ask_recurrence_modification_type (GTK_WIDGET (self),
|
||||
self->edited_event,
|
||||
schedule_equal,
|
||||
on_ask_recurrence_response_save_cb,
|
||||
self);
|
||||
gcal_util_ask_recurrence_modification_type (GTK_WIDGET (self),
|
||||
self->edited_event,
|
||||
schedule_equal,
|
||||
on_ask_recurrence_response_save_cb,
|
||||
self);
|
||||
GCAL_RETURN (FALSE);
|
||||
}
|
||||
|
||||
@@ -392,11 +392,11 @@ on_delete_row_activated_cb (AdwButtonRow *button,
|
||||
|
||||
if (gcal_event_has_recurrence (self->edited_event))
|
||||
{
|
||||
gcal_utils_ask_recurrence_modification_type (GTK_WIDGET (self),
|
||||
self->edited_event,
|
||||
TRUE,
|
||||
on_ask_recurrence_response_delete_cb,
|
||||
self);
|
||||
gcal_util_ask_recurrence_modification_type (GTK_WIDGET (self),
|
||||
self->edited_event,
|
||||
TRUE,
|
||||
on_ask_recurrence_response_delete_cb,
|
||||
self);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -60,7 +60,7 @@ on_copy_email_cb (GSimpleAction *action,
|
||||
GdkClipboard *clipboard = gdk_display_get_clipboard (display);
|
||||
|
||||
g_autofree const gchar *email =
|
||||
gcal_get_email_from_mailto_uri (gcal_event_organizer_get_uri (self->organizer));
|
||||
gcal_util_get_email_from_mailto_uri (gcal_event_organizer_get_uri (self->organizer));
|
||||
|
||||
gdk_clipboard_set_text (clipboard, email);
|
||||
}
|
||||
@@ -88,7 +88,7 @@ generate_subtitle (GcalOrganizerRow *self,
|
||||
if (organizer == NULL)
|
||||
return NULL;
|
||||
|
||||
email = gcal_get_email_from_mailto_uri (gcal_event_organizer_get_uri (organizer));
|
||||
email = gcal_util_get_email_from_mailto_uri (gcal_event_organizer_get_uri (organizer));
|
||||
name_with_email = g_strdup_printf ("%s (%s)", gcal_event_organizer_get_name (organizer), email);
|
||||
|
||||
return g_strdup (name_with_email);
|
||||
|
||||
@@ -191,7 +191,7 @@ setup_alarms (GcalRemindersSection *self,
|
||||
alarm = l->data;
|
||||
|
||||
/* Make already-added alarm buttons insensitive */
|
||||
minutes = get_alarm_trigger_minutes (event, alarm);
|
||||
minutes = gcal_util_get_alarm_trigger_minutes (event, alarm);
|
||||
|
||||
for (j = 0; j < G_N_ELEMENTS (minutes_button); j++)
|
||||
{
|
||||
@@ -237,10 +237,10 @@ sort_alarms_func (GtkListBoxRow *a,
|
||||
return -1;
|
||||
|
||||
alarm_a = gcal_alarm_row_get_alarm (GCAL_ALARM_ROW (a));
|
||||
minutes_a = get_alarm_trigger_minutes (event, alarm_a);
|
||||
minutes_a = gcal_util_get_alarm_trigger_minutes (event, alarm_a);
|
||||
|
||||
alarm_b = gcal_alarm_row_get_alarm (GCAL_ALARM_ROW (b));
|
||||
minutes_b = get_alarm_trigger_minutes (event, alarm_b);
|
||||
minutes_b = gcal_util_get_alarm_trigger_minutes (event, alarm_b);
|
||||
|
||||
return minutes_a - minutes_b;
|
||||
}
|
||||
@@ -259,7 +259,7 @@ on_remove_alarm_cb (GcalAlarmRow *alarm_row,
|
||||
event = gcal_event_editor_section_get_event (GCAL_EVENT_EDITOR_SECTION (self));
|
||||
|
||||
alarm = gcal_alarm_row_get_alarm (alarm_row);
|
||||
trigger_minutes = get_alarm_trigger_minutes (event, alarm);
|
||||
trigger_minutes = gcal_util_get_alarm_trigger_minutes (event, alarm);
|
||||
gcal_event_remove_alarm (event, trigger_minutes);
|
||||
|
||||
/* Make the button sensitive again */
|
||||
|
||||
@@ -53,9 +53,9 @@ on_summary_entry_text_changed_cb (GcalSummarySection *self)
|
||||
summary = gcal_event_get_summary (event);
|
||||
text = gtk_editable_get_text (GTK_EDITABLE (self->summary_entry));
|
||||
|
||||
should_request_validation = gcal_is_valid_event_name (text) != gcal_is_valid_event_name (summary);
|
||||
should_request_validation = gcal_util_is_valid_event_name (text) != gcal_util_is_valid_event_name (summary);
|
||||
|
||||
if (gcal_is_valid_event_name (text))
|
||||
if (gcal_util_is_valid_event_name (text))
|
||||
gtk_widget_remove_css_class (GTK_WIDGET (self->summary_entry), "error");
|
||||
else
|
||||
gtk_widget_add_css_class (GTK_WIDGET (self->summary_entry), "error");
|
||||
|
||||
Reference in New Issue
Block a user