diff options
| author | Alexander Larsson <alexl@redhat.com> | 2019-08-29 15:21:20 +0200 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-09-10 12:08:20 -0400 |
| commit | 96b37f4eb8ec0e7598534a83816be7c013fd1c9b (patch) | |
| tree | dfb83ab6a57766627dc82cfc12b8eadef7bfaa5e /gtk/gtkcomboboxtext.c | |
| parent | 135cea76fbe41cea7a83ebb3381bdc1410f8f9fb (diff) | |
| download | gtk+-96b37f4eb8ec0e7598534a83816be7c013fd1c9b.tar.gz | |
Use the new GtkBuildableParser type in GtkBuildable interfaces
Diffstat (limited to 'gtk/gtkcomboboxtext.c')
| -rw-r--r-- | gtk/gtkcomboboxtext.c | 71 |
1 files changed, 36 insertions, 35 deletions
diff --git a/gtk/gtkcomboboxtext.c b/gtk/gtkcomboboxtext.c index 0db2906d81..3794690414 100644 --- a/gtk/gtkcomboboxtext.c +++ b/gtk/gtkcomboboxtext.c @@ -99,19 +99,20 @@ struct _GtkComboBoxTextClass }; -static void gtk_combo_box_text_buildable_interface_init (GtkBuildableIface *iface); -static gboolean gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, - GtkBuilder *builder, - GObject *child, - const gchar *tagname, - GMarkupParser *parser, - gpointer *data); - -static void gtk_combo_box_text_buildable_custom_finished (GtkBuildable *buildable, - GtkBuilder *builder, - GObject *child, - const gchar *tagname, - gpointer user_data); +static void gtk_combo_box_text_buildable_interface_init (GtkBuildableIface *iface); +static gboolean gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + GtkBuildableParser *parser, + gpointer *data); + +static void gtk_combo_box_text_buildable_custom_finished (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + gpointer user_data); + static GtkBuildableIface *buildable_parent_iface = NULL; @@ -184,12 +185,12 @@ typedef struct { } ItemParserData; static void -item_start_element (GMarkupParseContext *context, - const gchar *element_name, - const gchar **names, - const gchar **values, - gpointer user_data, - GError **error) +item_start_element (GtkBuildableParseContext *context, + const gchar *element_name, + const gchar **names, + const gchar **values, + gpointer user_data, + GError **error) { ItemParserData *data = (ItemParserData*)user_data; @@ -237,11 +238,11 @@ item_start_element (GMarkupParseContext *context, } static void -item_text (GMarkupParseContext *context, - const gchar *text, - gsize text_len, - gpointer user_data, - GError **error) +item_text (GtkBuildableParseContext *context, + const gchar *text, + gsize text_len, + gpointer user_data, + GError **error) { ItemParserData *data = (ItemParserData*)user_data; @@ -250,10 +251,10 @@ item_text (GMarkupParseContext *context, } static void -item_end_element (GMarkupParseContext *context, - const gchar *element_name, - gpointer user_data, - GError **error) +item_end_element (GtkBuildableParseContext *context, + const gchar *element_name, + gpointer user_data, + GError **error) { ItemParserData *data = (ItemParserData*)user_data; @@ -280,7 +281,7 @@ item_end_element (GMarkupParseContext *context, data->is_text = FALSE; } -static const GMarkupParser item_parser = +static const GtkBuildableParser item_parser = { item_start_element, item_end_element, @@ -288,12 +289,12 @@ static const GMarkupParser item_parser = }; static gboolean -gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, - GtkBuilder *builder, - GObject *child, - const gchar *tagname, - GMarkupParser *parser, - gpointer *parser_data) +gtk_combo_box_text_buildable_custom_tag_start (GtkBuildable *buildable, + GtkBuilder *builder, + GObject *child, + const gchar *tagname, + GtkBuildableParser *parser, + gpointer *parser_data) { if (buildable_parent_iface->custom_tag_start (buildable, builder, child, tagname, parser, parser_data)) |