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

utils: Remove get_source_parent_name_color

Browse Source 
One less weird function lurking around.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/610>
This commit is contained in:
Georges Basile Stavracas Neto
2025-07-02 18:04:26 +00:00
committed by Marge Bot
parent 281191b5b3
commit d16cc2bc68
6 changed files with 18 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/calendar-management/gcal-calendars-page.c
+12 -19
View File
@@ -72,13 +72,11 @@ make_calendar_row (GcalCalendarsPage *self,
g_autoptr (GtkBuilder) builder = NULL;
GtkWidget *read_only_icon;
const GdkRGBA *color;
GcalManager *manager;
GtkWidget *icon;
GtkWidget *row;
GtkWidget *sw;
manager = gcal_context_get_manager (self->context);
get_source_parent_name_color (manager, gcal_calendar_get_source (calendar), &parent_name, NULL);
parent_name = e_source_dup_display_name (gcal_calendar_get_parent_source (calendar));
builder = gtk_builder_new_from_resource ("/org/gnome/calendar/ui/gui/calendar-management/calendar-row.ui");
@@ -206,28 +204,23 @@ listbox_sort_func (GtkListBoxRow *row1,
GtkListBoxRow *row2,
gpointer user_data)
{
g_autofree gchar *parent_name1 = NULL;
g_autofree gchar *parent_name2 = NULL;
GcalCalendarsPage *self;
GcalManager *manager;
ESource *source1;
ESource *source2;
GcalCalendar *calendar1;
GcalCalendar *calendar2;
const gchar *parent_name1;
const gchar *parent_name2;
gint retval;
self = GCAL_CALENDARS_PAGE (user_data);
calendar1 = g_object_get_data (G_OBJECT (row1), "calendar");
calendar2 = g_object_get_data (G_OBJECT (row2), "calendar");
manager = gcal_context_get_manager (self->context);
source1 = g_object_get_data (G_OBJECT (row1), "source");
source2 = g_object_get_data (G_OBJECT (row2), "source");
retval = g_ascii_strcasecmp (e_source_get_display_name (source1), e_source_get_display_name (source2));
retval = g_ascii_strcasecmp (gcal_calendar_get_name (calendar1), gcal_calendar_get_name (calendar2));
if (retval != 0)
return retval;
get_source_parent_name_color (manager, source1, &parent_name1, NULL);
get_source_parent_name_color (manager, source2, &parent_name2, NULL);
parent_name1 = e_source_get_display_name (gcal_calendar_get_parent_source (calendar1));
parent_name2 = e_source_get_display_name (gcal_calendar_get_parent_source (calendar2));
return g_strcmp0 (parent_name1, parent_name2);
}
@@ -475,6 +468,6 @@ gcal_calendars_page_init (GcalCalendarsPage *self)
gtk_list_box_set_sort_func (self->listbox,
(GtkListBoxSortFunc) listbox_sort_func,
self,
NULL,
NULL);
}
src/gui/calendar-management/gcal-edit-calendar-page.c
+2 -8
View File
@@ -121,8 +121,6 @@ static void
setup_calendar (GcalEditCalendarPage *self,
GcalCalendar *calendar)
{
g_autofree gchar *parent_name = NULL;
GcalManager *manager;
ESource *source;
gboolean is_remote;
gboolean is_file;
@@ -130,14 +128,11 @@ setup_calendar (GcalEditCalendarPage *self,
self->calendar = g_object_ref (calendar);
manager = gcal_context_get_manager (self->context);
is_goa = is_goa_calendar (self, calendar);
source = gcal_calendar_get_source (calendar);
is_file = e_source_has_extension (source, E_SOURCE_EXTENSION_LOCAL_BACKEND);
is_remote = is_remote_source (source);
get_source_parent_name_color (manager, source, &parent_name, NULL);
GCAL_TRACE_MSG ("Calendar '%s' is GOA: %d; is file: %d; is remote: %d",
gcal_calendar_get_name (calendar),
is_goa,
@@ -192,10 +187,9 @@ setup_calendar (GcalEditCalendarPage *self,
if (is_goa)
{
g_autofree gchar *name = NULL;
const gchar *parent_name = e_source_get_display_name (gcal_calendar_get_parent_source (calendar));
get_source_parent_name_color (manager, source, &name, NULL);
adw_action_row_set_subtitle (self->account_row, name);
adw_action_row_set_subtitle (self->account_row, parent_name);
}
if (!is_goa && !is_remote && !is_file)
src/gui/gcal-quick-add-popover.c
+1 -1
View File
@@ -110,7 +110,7 @@ create_calendar_row (GcalManager *manager,
gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
/* Setup also a cool tooltip */
get_source_parent_name_color (manager, gcal_calendar_get_source (calendar), &parent_name, NULL);
parent_name = e_source_dup_display_name (gcal_calendar_get_parent_source (calendar));
if (read_only)
tooltip = g_strdup_printf (_("%s (this calendar is read-only)"), parent_name);