callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssprovider: Allow storing the parent stylesheet

Browse Source
This commit is contained in:
Benjamin Otte
2011-04-12 02:06:08 +02:00
parent 286b5b9b72
commit 22492a37c1
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
gtk/gtkcssprovider.c
View File

@ -788,6 +788,7 @@ struct SelectorStyleInfo
struct _GtkCssScannerPrivate struct _GtkCssScannerPrivate
{ {
GScanner *parent;
GFile *file; GFile *file;
GFile *base; GFile *base;
GSList *state; GSList *state;
@ -844,6 +845,7 @@ static void scanner_apply_scope (GScanner *scanner,
ParserScope scope); ParserScope scope);
static gboolean static gboolean
gtk_css_provider_load_internal (GtkCssProvider *css_provider, gtk_css_provider_load_internal (GtkCssProvider *css_provider,
GScanner *scanner,
GFile *file, GFile *file,
const char *data, const char *data,
gsize length, gsize length,
@ -1168,7 +1170,8 @@ gtk_css_scanner_destroy (GScanner *scanner)
} }
static GScanner * static GScanner *
gtk_css_scanner_new (GFile *file, gtk_css_scanner_new (GScanner *parent,
GFile *file,
const gchar *data, const gchar *data,
gsize length) gsize length)
{ {
@ -1179,6 +1182,8 @@ gtk_css_scanner_new (GFile *file,
priv = scanner->user_data = g_slice_new0 (GtkCssScannerPrivate); priv = scanner->user_data = g_slice_new0 (GtkCssScannerPrivate);
priv->parent = parent;
if (file) if (file)
{ {
priv->file = g_object_ref (file); priv->file = g_object_ref (file);
@ -2279,6 +2284,7 @@ parse_rule (GtkCssProvider *css_provider,
/* FIXME: Avoid recursive importing */ /* FIXME: Avoid recursive importing */
gtk_css_provider_load_internal (css_provider, gtk_css_provider_load_internal (css_provider,
scanner,
actual, actual,
NULL, 0, NULL, 0,
NULL); NULL);
@ -2620,6 +2626,7 @@ parse_stylesheet (GtkCssProvider *css_provider,
static gboolean static gboolean
gtk_css_provider_load_internal (GtkCssProvider *css_provider, gtk_css_provider_load_internal (GtkCssProvider *css_provider,
GScanner *parent,
GFile *file, GFile *file,
const char *data, const char *data,
gsize length, gsize length,
@ -2649,10 +2656,23 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
} }
else else
{ {
gtk_css_provider_take_error_full (css_provider, if (parent)
file, {
0, 0, gtk_css_provider_error (css_provider,
load_error); parent,
GTK_CSS_PROVIDER_ERROR,
GTK_CSS_PROVIDER_ERROR_IMPORT,
"Failed to import: %s",
load_error->message);
g_error_free (load_error);
}
else
{
gtk_css_provider_take_error_full (css_provider,
file,
0, 0,
load_error);
}
} }
} }
else else
@ -2660,7 +2680,7 @@ gtk_css_provider_load_internal (GtkCssProvider *css_provider,
if (data) if (data)
{ {
scanner = gtk_css_scanner_new (file, data, length); scanner = gtk_css_scanner_new (parent, file, data, length);
parse_stylesheet (css_provider, scanner); parse_stylesheet (css_provider, scanner);
@ -2708,7 +2728,7 @@ gtk_css_provider_load_from_data (GtkCssProvider *css_provider,
gtk_css_provider_reset (css_provider); gtk_css_provider_reset (css_provider);
return gtk_css_provider_load_internal (css_provider, NULL, data, length, error); return gtk_css_provider_load_internal (css_provider, NULL, NULL, data, length, error);
} }
/** /**
@ -2732,7 +2752,7 @@ gtk_css_provider_load_from_file (GtkCssProvider *css_provider,
gtk_css_provider_reset (css_provider); gtk_css_provider_reset (css_provider);
return gtk_css_provider_load_internal (css_provider, file, NULL, 0, error); return gtk_css_provider_load_internal (css_provider, NULL, file, NULL, 0, error);
} }
/** /**