Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssprovider: Don't fail if an import doesn't work

Browse Source
This commit is contained in:
Benjamin Otte
2011-04-12 01:50:07 +02:00
parent d6c6a0bcc0
commit 286b5b9b72
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkcssprovider.c
View File

@@ -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)
{