[gtk+] GtkBuilder: Unify builder error messages
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkBuilder: Unify builder error messages
- Date: Mon, 27 Apr 2015 05:17:55 +0000 (UTC)
commit 44bf00d5dad70eeda35ac6b889e281af3ec3029e
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Apr 25 19:29:40 2015 -0400
GtkBuilder: Unify builder error messages
Don't use <%s> for an attribute.
gtk/gtkbuilderparser.c | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index 70fd778..3a42044 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -243,11 +243,6 @@ parse_requires (ParserData *data,
const gchar *version = NULL;
gchar **split;
gint i, version_major = 0, version_minor = 0;
- gint line_number, char_number;
-
- g_markup_parse_context_get_position (data->ctx,
- &line_number,
- &char_number);
for (i = 0; names[i] != NULL; i++)
{
@@ -261,19 +256,21 @@ parse_requires (ParserData *data,
if (!library || !version)
{
- error_missing_attribute (data, element_name,
+ error_missing_attribute (data, element_name,
version ? "lib" : "version", error);
return;
}
if (!(split = g_strsplit (version, ".", 2)) || !split[0] || !split[1])
{
+ gint line, col;
+
+ g_markup_parse_context_get_position (data->ctx, &line, &col);
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE,
- "%s:%d:%d <%s> attribute has malformed value \"%s\"",
- data->filename,
- line_number, char_number, "version", version);
+ "%s:%d:%d '%s' attribute has malformed value \"%s\"",
+ data->filename, line, col, "version", version);
return;
}
version_major = g_ascii_strtoll (split[0], NULL, 10);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]