Melhorando mensagem de erro no processamento do xml, incluindo teste por atributo invalido

perry.werneck@gmail.com
1 parent 86d3732f
Showing 3 changed files with 7 additions and 4 deletions Show diff stats
src/gtk/actions.c
src/gtk/uiparser/parsefile.c
ui/00default.xml
@@ -270,6 +270,9 @@ static int id_from_array(const gchar *key, const gchar **array, GError **error)
 {
 	int f;
+	if(!key)
+		return -1;
+
 	for(f = 0;array[f];f++)
 	{
 		if(!g_strcasecmp(key,array[f]))
@@ -312,7 +312,7 @@ trace(&quot;%s ----&quot;,__FUNCTION__);
 		return -1;
 	}
-	context = g_markup_parse_context_new(&parser,G_MARKUP_TREAT_CDATA_AS_TEXT,info,NULL);
+	context = g_markup_parse_context_new(&parser,G_MARKUP_TREAT_CDATA_AS_TEXT|G_MARKUP_PREFIX_ERROR_POSITION,info,NULL);
 	if(!g_markup_parse_context_parse(context,text,strlen(text),&error))
 	{
@@ -152,9 +152,9 @@
 	</toolbar>
 	<popup name='selectionpopup' type='selection'>
-		<menuitem action='Copy'/>
-		<menuitem action='Append'/>
-		<menuitem action='Unselect'/>
+		<menuitem action='copy' mode='begin' />
+		<menuitem action='copy' mode='append' />
+		<menuitem action='unselect'/>
 		<menuitem action='selectall'/>
 		<separator />
	@@ -312,7 +312,7 @@ trace("%s ----",__FUNCTION__);		@@ -312,7 +312,7 @@ trace("%s ----",__FUNCTION__);
312	return -1;	312	return -1;
313	}	313	}
314		314
315	- context = g_markup_parse_context_new(&parser,G_MARKUP_TREAT_CDATA_AS_TEXT,info,NULL);	315	+ context = g_markup_parse_context_new(&parser,G_MARKUP_TREAT_CDATA_AS_TEXT\|G_MARKUP_PREFIX_ERROR_POSITION,info,NULL);
316		316
317	if(!g_markup_parse_context_parse(context,text,strlen(text),&error))	317	if(!g_markup_parse_context_parse(context,text,strlen(text),&error))
318	{	318	{