utils: Remove get_source_parent_name_color

One less weird function lurking around.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/610>

src/core/gcal-manager.c

@@ -197,16 +197,14 @@ sort_calendar_by_name_cb (gconstpointer a,
   GcalCalendar *calendar_b = GCAL_CALENDAR ((gpointer) b);
   g_autofree gchar *parent_name_a = NULL;
   g_autofree gchar *parent_name_b = NULL;
-  GcalManager *self;
   gint retval;
 
   retval = g_utf8_collate (gcal_calendar_get_name (calendar_a), gcal_calendar_get_name (calendar_b));
   if (retval != 0)
     return retval;
 
-  self = GCAL_MANAGER (user_data);
+  parent_name_a = e_source_dup_display_name (gcal_calendar_get_parent_source (calendar_a));
-  get_source_parent_name_color (self, gcal_calendar_get_source (calendar_a), &parent_name_a, NULL);
+  parent_name_b = e_source_dup_display_name (gcal_calendar_get_parent_source (calendar_b));
-  get_source_parent_name_color (self, gcal_calendar_get_source (calendar_b), &parent_name_b, NULL);
 
   return g_utf8_collate (parent_name_a, parent_name_b);
 }
@@ -216,7 +214,7 @@ on_calendar_name_changed_cb (GcalCalendar *calendar,
                              GParamSpec   *pspec,
                              GcalManager  *self)
 {
-  g_list_store_sort (self->calendars_model, sort_calendar_by_name_cb, self);
+  g_list_store_sort (self->calendars_model, sort_calendar_by_name_cb, NULL);
 }
 
 static void

src/gui/calendar-management/gcal-calendars-page.c

@@ -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);
+  parent_name = e_source_dup_display_name (gcal_calendar_get_parent_source (calendar));
-  get_source_parent_name_color (manager, gcal_calendar_get_source (calendar), &parent_name, NULL);
 
   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;
+  GcalCalendar *calendar1;
-  g_autofree gchar *parent_name2 = NULL;
+  GcalCalendar *calendar2;
-  GcalCalendarsPage *self;
+  const gchar *parent_name1;
-  GcalManager *manager;
+  const gchar *parent_name2;
-  ESource *source1;
-  ESource *source2;
   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);
+  retval = g_ascii_strcasecmp (gcal_calendar_get_name (calendar1), gcal_calendar_get_name (calendar2));
-
-  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));
 
   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

@@ -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, parent_name);
-      adw_action_row_set_subtitle (self->account_row, name);
     }
 
   if (!is_goa && !is_remote && !is_file)

src/gui/gcal-quick-add-popover.c

@@ -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);

src/utils/gcal-utils.c

@@ -617,41 +617,6 @@ e_utf8_strftime_fix_am_pm (gchar *str,
   return sz;
 }
 
-/**
- * get_source_parent_name_color:
- * @manager: a #GcalManager
- * @source: an #ESource
- * @name: (nullable): return location for the name
- * @color: (nullable): return location for the color
- *
- * Retrieves the name and the color of the #ESource that is
- * parent of @source.
- */
-void
-get_source_parent_name_color (GcalManager  *manager,
-                              ESource      *source,
-                              gchar       **name,
-                              gchar       **color)
-{
-  ESource *parent_source;
-
-  g_assert (source && E_IS_SOURCE (source));
-
-  parent_source = gcal_manager_get_source (manager, e_source_get_parent (source));
-
-  if (name != NULL)
-    *name = e_source_dup_display_name (parent_source);
-
-  if (color != NULL)
-    {
-      GdkRGBA c;
-
-      get_color_name_from_source (parent_source, &c);
-
-      *color = gdk_rgba_to_string (&c);
-    }
-}
-
 /**
  * format_utc_offset:
  * @offset: an UTC offset

src/utils/gcal-utils.h

@@ -92,11 +92,6 @@ gsize                e_utf8_strftime_fix_am_pm                   (gchar
                                                                   const gchar        *fmt,
                                                                   const struct tm    *tm);
 
-void                 get_source_parent_name_color                (GcalManager        *manager,
-                                                                  ESource            *source,
-                                                                  gchar             **name,
-                                                                  gchar             **color);
-
 gchar*               format_utc_offset                           (gint64              offset);
 
 gint                 get_alarm_trigger_minutes                   (GcalEvent          *event,