[gnome-themes-standard] adwaita: Don't spew errors without resource



commit 1aed68dbda8b93b39d2586df132cc14ca337c4d9
Author: Benjamin Otte <otte redhat com>
Date:   Thu Nov 15 19:38:46 2012 +0100

    adwaita: Don't spew errors without resource
    
    If the resource doesn't exist, it usually means people are hacking the
    theme with a custom @import from the home directory.

 themes/Adwaita/gtk-3.0/adwaita_engine.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/adwaita_engine.c b/themes/Adwaita/gtk-3.0/adwaita_engine.c
index f0f48ac..464270e 100644
--- a/themes/Adwaita/gtk-3.0/adwaita_engine.c
+++ b/themes/Adwaita/gtk-3.0/adwaita_engine.c
@@ -87,7 +87,7 @@ fallback_provider_remove (AdwaitaEngine *self)
 static void
 fallback_provider_add (AdwaitaEngine *self)
 {
-  GFile *resource;
+  GResource *resource;
   GtkCssProvider *provider;
   GError *error = NULL;
   GdkScreen *screen;
@@ -95,9 +95,13 @@ fallback_provider_add (AdwaitaEngine *self)
   if (self->fallback_provider != NULL)
     return;
 
-  resource = g_file_new_for_uri ("resource:///org/gnome/adwaita/gtk-fallback.css");
+  resource = g_resource_load ("/org/gnome/adwaita/gtk-fallback.css", NULL);
+  /* Don't spew errors here, this happens while hacking the theme */
+  if (resource == NULL)
+    return;
+
   provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_file (provider, resource, &error);
+  gtk_css_provider_load_from_resource (provider, resource, &error);
   g_object_unref (resource);
 
   if (error != NULL)



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