AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

cssimageicontheme: Use gtk_css_parser_consume_function()

Browse Source
This commit is contained in:
Benjamin Otte 2019-03-25 04:11:08 +01:00
parent 38227dc972
commit 3597f7e8b1
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkcssimageicontheme.c
View File

@ -126,30 +126,31 @@ gtk_css_image_icon_theme_snapshot (GtkCssImage *image,
gtk_snapshot_pop (snapshot); gtk_snapshot_pop (snapshot);
} }
static guint
gtk_css_image_icon_theme_parse_arg (GtkCssParser *parser,
guint arg,
gpointer data)
{
GtkCssImageIconTheme *icon_theme = data;
icon_theme->name = _gtk_css_parser_read_string (parser);
if (icon_theme->name == NULL)
return 0;
return 1;
}
static gboolean static gboolean
gtk_css_image_icon_theme_parse (GtkCssImage *image, gtk_css_image_icon_theme_parse (GtkCssImage *image,
GtkCssParser *parser) GtkCssParser *parser)
{ {
GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image); if (!gtk_css_parser_has_function (parser, "-gtk-icontheme"))
if (!_gtk_css_parser_try (parser, "-gtk-icontheme(", TRUE))
{ {
_gtk_css_parser_error (parser, "Expected '-gtk-icontheme('"); _gtk_css_parser_error (parser, "Expected '-gtk-icontheme('");
return FALSE; return FALSE;
} }
icon_theme->name = _gtk_css_parser_read_string (parser); return gtk_css_parser_consume_function (parser, 1, 1, gtk_css_image_icon_theme_parse_arg, image);
if (icon_theme->name == NULL)
return FALSE;
if (!_gtk_css_parser_try (parser, ")", TRUE))
{
_gtk_css_parser_error (parser, "Missing closing bracket at end of '-gtk-icontheme'");
return FALSE;
}
return TRUE;
} }
static void static void