summaryrefslogtreecommitdiff
path: root/gtk/gtkcssparser.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2011-05-29 07:03:59 +0200
committerBenjamin Otte <otte@redhat.com>2011-06-15 12:52:53 +0200
commit0d253b67f41fd9f8956f763dda275cfa8353cd7f (patch)
tree2a4a9882a8cfa7422a93c3afc546058fa81801d0 /gtk/gtkcssparser.c
parent0c162851ed3be918748724df8535f63b82626bb7 (diff)
downloadgtk+-0d253b67f41fd9f8956f763dda275cfa8353cd7f.tar.gz
css: Make font property a shorthand
... and implement the CSS font properties: - font-size - font-style - font-family - font-weight - font-variant This is the second try at this. The first was backed out previously due to bugginess. Let's hope this one survives a bit longer. Also makes the font-family CSS test work again.
Diffstat (limited to 'gtk/gtkcssparser.c')
-rw-r--r--gtk/gtkcssparser.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkcssparser.c b/gtk/gtkcssparser.c
index 80544515e1..1b2710d047 100644
--- a/gtk/gtkcssparser.c
+++ b/gtk/gtkcssparser.c
@@ -386,7 +386,10 @@ _gtk_css_parser_read_string (GtkCssParser *parser)
quote = *parser->data;
if (quote != '"' && quote != '\'')
- return NULL;
+ {
+ _gtk_css_parser_error (parser, "Expected a string.");
+ return NULL;
+ }
parser->data++;
str = g_string_new (NULL);