From 17e3d6f85e0f9339d2e7ac347d0dcc160e500cb7 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 18 May 2011 18:35:37 +0200 Subject: [PATCH] cssprovider: Don't propagate deprecation messages to passed-in error It's an informative message, don't stop parsing the CSS because of it. --- gtk/gtkcssprovider.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index ab6580451a..1f6c7a7809 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -1410,6 +1410,13 @@ gtk_css_provider_propagate_error (GtkCssProvider *provider, const GError *error, GError **propagate_to) { + /* don't fail for deprecations */ + if (g_error_matches (error, GTK_CSS_PROVIDER_ERROR, GTK_CSS_PROVIDER_ERROR_DEPRECATED)) + { + g_warning ("Theme parsing error: %s:%u:%u: %s", path ? path : "", line, position, error->message); + return; + } + /* we already set an error. And we'd like to keep the first one */ if (*propagate_to) return;