[gtk/wip/otte/css: 13/59] cssimageicontheme: Use gtk_css_parser_consume_function()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/css: 13/59] cssimageicontheme: Use gtk_css_parser_consume_function()
- Date: Thu, 11 Apr 2019 05:26:23 +0000 (UTC)
commit 4cf6a91c670ade5b905719f6bb94900d779d4ccd
Author: Benjamin Otte <otte redhat com>
Date: Mon Mar 25 04:11:08 2019 +0100
cssimageicontheme: Use gtk_css_parser_consume_function()
gtk/gtkcssimageicontheme.c | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkcssimageicontheme.c b/gtk/gtkcssimageicontheme.c
index d481659a4c..ee0dee9afe 100644
--- a/gtk/gtkcssimageicontheme.c
+++ b/gtk/gtkcssimageicontheme.c
@@ -126,30 +126,31 @@ gtk_css_image_icon_theme_snapshot (GtkCssImage *image,
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
gtk_css_image_icon_theme_parse (GtkCssImage *image,
GtkCssParser *parser)
{
- GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image);
-
- if (!_gtk_css_parser_try (parser, "-gtk-icontheme(", TRUE))
+ if (!gtk_css_parser_has_function (parser, "-gtk-icontheme"))
{
_gtk_css_parser_error (parser, "Expected '-gtk-icontheme('");
return FALSE;
}
- icon_theme->name = _gtk_css_parser_read_string (parser);
- 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;
+ return gtk_css_parser_consume_function (parser, 1, 1, gtk_css_image_icon_theme_parse_arg, image);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]