[gtk+/parser: 60/74] cssprovider: Don't fail if an import doesn't work
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/parser: 60/74] cssprovider: Don't fail if an import doesn't work
- Date: Mon, 9 May 2011 15:27:48 +0000 (UTC)
commit 6cd9c9d54d78a72fa87d392f653bd7183c151370
Author: Benjamin Otte <otte redhat com>
Date: Tue Apr 12 01:50:07 2011 +0200
cssprovider: Don't fail if an import doesn't work
gtk/gtkcssprovider.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index c746b4c..fbf2782 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2239,7 +2239,6 @@ parse_rule (GtkCssProvider *css_provider,
}
else if (strcmp (directive, "import") == 0)
{
- gboolean loaded;
gchar *path = NULL;
GFile *actual;
GError *error = NULL;
@@ -2279,17 +2278,14 @@ parse_rule (GtkCssProvider *css_provider,
}
/* FIXME: Avoid recursive importing */
- loaded = gtk_css_provider_load_internal (css_provider,
- actual,
- NULL, 0,
- NULL);
+ gtk_css_provider_load_internal (css_provider,
+ actual,
+ NULL, 0,
+ NULL);
g_object_unref (actual);
- if (!loaded)
- return G_TOKEN_IDENTIFIER;
- else
- return G_TOKEN_NONE;
+ return G_TOKEN_NONE;
}
else if (strcmp (directive, "binding-set") == 0)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]