callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkBuilder: Unify builder error messages

Browse Source 
Don't use <%s> for an attribute.
This commit is contained in:
Matthias Clasen
2015-04-25 19:29:40 -04:00
parent 31ff1204a4
commit 44bf00d5da
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkbuilderparser.c
View File

@ -243,11 +243,6 @@ parse_requires (ParserData *data,
const gchar *version = NULL; const gchar *version = NULL;
gchar **split; gchar **split;
gint i, version_major = 0, version_minor = 0; 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++) for (i = 0; names[i] != NULL; i++)
{ {
@ -261,19 +256,21 @@ parse_requires (ParserData *data,
if (!library || !version) if (!library || !version)
{ {
error_missing_attribute (data, element_name, error_missing_attribute (data, element_name,
version ? "lib" : "version", error); version ? "lib" : "version", error);
return; return;
} }
if (!(split = g_strsplit (version, ".", 2)) || !split[0] || !split[1]) 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, g_set_error (error,
GTK_BUILDER_ERROR, GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_INVALID_VALUE, GTK_BUILDER_ERROR_INVALID_VALUE,
"%s:%d:%d <%s> attribute has malformed value \"%s\"", "%s:%d:%d '%s' attribute has malformed value \"%s\"",
data->filename, data->filename, line, col, "version", version);
line_number, char_number, "version", version);
return; return;
} }
version_major = g_ascii_strtoll (split[0], NULL, 10); version_major = g_ascii_strtoll (split[0], NULL, 10);