[gnome-themes-standard] Revert "adwaita: Don't spew errors without resource"
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] Revert "adwaita: Don't spew errors without resource"
- Date: Wed, 12 Dec 2012 13:17:56 +0000 (UTC)
commit 6526ad8671f51e2590c12b253ca38a7da66d29cf
Author: Benjamin Otte <otte redhat com>
Date: Wed Dec 12 14:17:30 2012 +0100
Revert "adwaita: Don't spew errors without resource"
This reverts commit 1aed68dbda8b93b39d2586df132cc14ca337c4d9.
That code was bogus, gtk_css_provider_load_from_resource() doesn't even
exist.
themes/Adwaita/gtk-3.0/adwaita_engine.c | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/adwaita_engine.c b/themes/Adwaita/gtk-3.0/adwaita_engine.c
index 464270e..f0f48ac 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)
{
- GResource *resource;
+ GFile *resource;
GtkCssProvider *provider;
GError *error = NULL;
GdkScreen *screen;
@@ -95,13 +95,9 @@ fallback_provider_add (AdwaitaEngine *self)
if (self->fallback_provider != NULL)
return;
- 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;
-
+ resource = g_file_new_for_uri ("resource:///org/gnome/adwaita/gtk-fallback.css");
provider = gtk_css_provider_new ();
- gtk_css_provider_load_from_resource (provider, resource, &error);
+ gtk_css_provider_load_from_file (provider, resource, &error);
g_object_unref (resource);
if (error != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]