diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-04-04 17:42:45 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-04-17 08:59:19 +0200 |
| commit | 1170ecfd2ef2043330c961339948bf89021d9816 (patch) | |
| tree | 0b2457d206450a28b22697995ccb464f3e8dfceb /gtk/gtkcssshorthandpropertyimpl.c | |
| parent | 56f79fecce885e05b7fe1677a70b98c64ea4a85c (diff) | |
| download | gtk+-1170ecfd2ef2043330c961339948bf89021d9816.tar.gz | |
cssvalue: Convert border-image-width to border value
Diffstat (limited to 'gtk/gtkcssshorthandpropertyimpl.c')
| -rw-r--r-- | gtk/gtkcssshorthandpropertyimpl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c index 3a26a28afd..03d84e8c83 100644 --- a/gtk/gtkcssshorthandpropertyimpl.c +++ b/gtk/gtkcssshorthandpropertyimpl.c @@ -34,9 +34,7 @@ #include "gtkcssrepeatvalueprivate.h" #include "gtkcssstringvalueprivate.h" #include "gtkcssstylefuncsprivate.h" -#include "gtkcsstypesprivate.h" #include "gtkcssvalueprivate.h" -#include "gtkprivatetypebuiltins.h" #include "gtkstylepropertiesprivate.h" #include "gtksymboliccolorprivate.h" #include "gtktypebuiltins.h" @@ -316,13 +314,15 @@ parse_border_image (GtkCssShorthandProperty *shorthand, if (_gtk_css_parser_try (parser, "/", TRUE)) { - GValue value = G_VALUE_INIT; - - g_value_init (&value, GTK_TYPE_BORDER); - if (!_gtk_css_style_parse_value (&value, parser, base)) + values[2] = _gtk_css_border_value_parse (parser, + GTK_CSS_PARSE_PERCENT + | GTK_CSS_PARSE_LENGTH + | GTK_CSS_PARSE_NUMBER + | GTK_CSS_POSITIVE_ONLY, + TRUE, + FALSE); + if (values[2] == NULL) return FALSE; - values[2] = _gtk_css_value_new_from_gvalue (&value); - g_value_unset (&value); } } else |