[gnome-clocks/zbrown/style-loader] css: ignore resource not found



commit f564d2ac5b1cafc1342edda9b92a7510d5779f72
Author: Zander Brown <zbrown gnome org>
Date:   Fri Mar 20 10:32:18 2020 +0000

    css: ignore resource not found
    
    Fix https://gitlab.gnome.org/GNOME/gnome-clocks/issues/89

 src/utils.vala | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/src/utils.vala b/src/utils.vala
index 74b912d..7c03db0 100644
--- a/src/utils.vala
+++ b/src/utils.vala
@@ -38,11 +38,17 @@ namespace Utils {
 
 private void load_css (string css, bool required) {
     var provider = new Gtk.CssProvider ();
-    provider.load_from_resource ("/org/gnome/clocks/css/" + css + ".css");
-
-    Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (),
-                                              provider,
-                                              Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    try {
+        var data = resources_lookup_data ("/org/gnome/clocks/css/" + css + ".css", NONE);
+        provider.load_from_data ((string) data.get_data ());
+        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (),
+                                                  provider,
+                                                  Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    } catch (ResourceError.NOT_FOUND e) {
+        /* Ignore */
+    } catch (Error e) {
+        warning ("Didn't load css for %s: %s".printf (css, e.message));
+    }
 }
 
 public void load_main_css () {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]