From 40ce81f81a8ab8c972a763cf417bc466a6beb488 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Mon, 20 Jun 2022 14:43:31 +0200
Subject: [PATCH] Use the Libadwaita style loading mechanism

This simplifies the code and will help support the dark and high
constrast variants.
---
 src/gui/gcal-window.c                | 25 +------------------------
 src/theme/{Adwaita.css => style.css} |  0
 src/theme/theme.gresource.xml        |  4 ++--
 3 files changed, 3 insertions(+), 26 deletions(-)
 rename src/theme/{Adwaita.css => style.css} (100%)

diff --git a/src/gui/gcal-window.c b/src/gui/gcal-window.c
index 22d0860c..9024be1e 100644
--- a/src/gui/gcal-window.c
+++ b/src/gui/gcal-window.c
@@ -152,7 +152,6 @@ struct _GcalWindow
   gint                click_outside_handler_id;
 
   /* CSS */
-  GtkCssProvider     *provider;
   GtkCssProvider     *colors_provider;
 
   /* Window states */
@@ -300,36 +299,15 @@ recalculate_calendar_colors_css (GcalWindow *self)
 static void
 load_css_providers (GcalWindow *self)
 {
-  g_autoptr (GFile) css_file = NULL;
-  g_autofree gchar *theme_name = NULL;
-  g_autofree gchar *theme_uri = NULL;
   GdkDisplay *display;
 
   display = gtk_widget_get_display (GTK_WIDGET (self));
 
-  /* Theme */
-  self->provider = gtk_css_provider_new ();
-  gtk_style_context_add_provider_for_display (display,
-                                              GTK_STYLE_PROVIDER (self->provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1);
-
-  /* Retrieve the theme name */
-  g_object_get (gtk_settings_get_default (), "gtk-theme-name", &theme_name, NULL);
-  theme_uri = g_strconcat ("resource:///org/gnome/calendar/theme/", theme_name, ".css", NULL);
-
-  /* Try and load the CSS file */
-  css_file = g_file_new_for_uri (theme_uri);
-
-  if (g_file_query_exists (css_file, NULL))
-    gtk_css_provider_load_from_file (self->provider, css_file);
-  else
-    gtk_css_provider_load_from_resource (self->provider, "/org/gnome/calendar/theme/Adwaita.css");
-
   /* Calendar olors */
   self->colors_provider = gtk_css_provider_new ();
   gtk_style_context_add_provider_for_display (display,
                                               GTK_STYLE_PROVIDER (self->colors_provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 2);
+                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION + 1);
 }
 
 
@@ -795,7 +773,6 @@ gcal_window_finalize (GObject *object)
   gcal_clear_date_time (&window->active_date);
 
   g_clear_object (&window->colors_provider);
-  g_clear_object (&window->provider);
 
   G_OBJECT_CLASS (gcal_window_parent_class)->finalize (object);
 
diff --git a/src/theme/Adwaita.css b/src/theme/style.css
similarity index 100%
rename from src/theme/Adwaita.css
rename to src/theme/style.css
diff --git a/src/theme/theme.gresource.xml b/src/theme/theme.gresource.xml
index 2cbd4881..b1dd91ca 100644
--- a/src/theme/theme.gresource.xml
+++ b/src/theme/theme.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/calendar/theme">
-    <file>Adwaita.css</file>
+  <gresource prefix="/org/gnome/calendar">
+    <file>style.css</file>
   </gresource>
 </gresources>