Download as
Browse Code »

Commit 73683f2ee7f255e05a1cbfd7f2caead606108614

Authored by perry.werneck@gmail.com
1 parent 86d3732f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

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

Showing 3 changed files with 7 additions and 4 deletions   Show diff stats
src/gtk/actions.c
  Diff comments   View file @73683f2
... ... @@ -270,6 +270,9 @@ static int id_from_array(const gchar *key, const gchar **array, GError **error)
270 270 {
271 271 int f;
272 272  
  273 + if(!key)
  274 + return -1;
  275 +
273 276 for(f = 0;array[f];f++)
274 277 {
275 278 if(!g_strcasecmp(key,array[f]))
... ...
src/gtk/uiparser/parsefile.c
  Diff comments   View file @73683f2
... ... @@ -312,7 +312,7 @@ trace("%s ----",__FUNCTION__);
312 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 317 if(!g_markup_parse_context_parse(context,text,strlen(text),&error))
318 318 {
... ...
ui/00default.xml
  Diff comments   View file @73683f2
... ... @@ -152,9 +152,9 @@
152 152 </toolbar>
153 153  
154 154 <popup name='selectionpopup' type='selection'>
155   - <menuitem action='Copy'/>
156   - <menuitem action='Append'/>
157   - <menuitem action='Unselect'/>
  155 + <menuitem action='copy' mode='begin' />
  156 + <menuitem action='copy' mode='append' />
  157 + <menuitem action='unselect'/>
158 158 <menuitem action='selectall'/>
159 159  
160 160 <separator />
... ...