summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-04-27 19:20:29 -0400
committerMatthias Clasen <mclasen@redhat.com>2015-04-27 19:20:29 -0400
commit331db35d571c43e48e8165918f3b27b34bce58c7 (patch)
treeb49a86a20e40454ba5d0d7b87d18cfc44cb484a4
parentd99c3e03329b5a195e9d3d0b6509300510e20ce8 (diff)
downloadgtk+-331db35d571c43e48e8165918f3b27b34bce58c7.tar.gz
GtkLabel: Prefix more ui parser errors
This may become useful in gnome-builder for highlighting errors, so do it consistently.
-rw-r--r--gtk/gtklabel.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index e51300379e..def986faeb 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1598,17 +1598,19 @@ pango_start_element (GMarkupParseContext *context,
}
attr = attribute_from_text (data->builder, name, value, error);
-
- if (attr)
+ if (!attr)
{
- attr->start_index = start_val;
- attr->end_index = end_val;
+ _gtk_builder_prefix_error (data->builder, context, error);
+ return;
+ }
- if (!data->attrs)
- data->attrs = pango_attr_list_new ();
+ attr->start_index = start_val;
+ attr->end_index = end_val;
- pango_attr_list_insert (data->attrs, attr);
- }
+ if (!data->attrs)
+ data->attrs = pango_attr_list_new ();
+
+ pango_attr_list_insert (data->attrs, attr);
}
else if (strcmp (element_name, "attributes") == 0)
{