Commit 569d5ad7 authored by Matthias Clasen's avatar Matthias Clasen

GtkBuilder: Export the template parsing entry point

This will let gtk-builder-tool validate templates.
parent f06cd304
......@@ -1115,15 +1115,17 @@ gtk_builder_add_objects_from_file (GtkBuilder *builder,
}
/* Main private entry point for building composite container
* components from template XML
* components from template XML.
* This is exported purely to let gtk-builder-tool validate
* templates, applications have no need to call this function.
*/
guint
_gtk_builder_extend_with_template (GtkBuilder *builder,
GtkWidget *widget,
GType template_type,
const gchar *buffer,
gsize length,
GError **error)
gtk_builder_extend_with_template (GtkBuilder *builder,
GtkWidget *widget,
GType template_type,
const gchar *buffer,
gsize length,
GError **error)
{
GError *tmp_error;
......
......@@ -182,12 +182,12 @@ void _gtk_builder_menu_start (ParserData *parser_data,
void _gtk_builder_menu_end (ParserData *parser_data);
GType _gtk_builder_get_template_type (GtkBuilder *builder);
guint _gtk_builder_extend_with_template (GtkBuilder *builder,
GtkWidget *widget,
GType template_type,
const gchar *buffer,
gsize length,
GError **error);
GDK_AVAILABLE_IN_3_18
guint gtk_builder_extend_with_template (GtkBuilder *builder,
GtkWidget *widget,
GType template_type, const gchar *buffer,
gsize length,
GError **error);
void _gtk_builder_prefix_error (GtkBuilder *builder,
GMarkupParseContext *context,
......
......@@ -16812,7 +16812,7 @@ gtk_widget_init_template (GtkWidget *widget)
* will validate that the template is created for the correct GType and assert that
* there is no infinite recursion.
*/
if (!_gtk_builder_extend_with_template (builder, widget, class_type,
if (!gtk_builder_extend_with_template (builder, widget, class_type,
(const gchar *)g_bytes_get_data (template->data, NULL),
g_bytes_get_size (template->data),
&error))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment