From a40901c1155969297ee643acc2f8960c38ebfe6d Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 13 Jun 2008 10:44:34 +0000 Subject: [PATCH] silently skip unknown attributes instead of bailing out with an error in 2008-06-13 Michael Natterer * gtk/gtkuimanager.c (start_element_handler): silently skip unknown attributes instead of bailing out with an error in order to be compatible with possible future attribute names. This is related to the discussion in bug #516425 but actually needed for any kind of XML format extension. svn path=/trunk/; revision=20371 --- ChangeLog | 9 +++++++++ gtk/gtkuimanager.c | 17 +++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c35c546c70..5361f031a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-06-13 Michael Natterer + + * gtk/gtkuimanager.c (start_element_handler): silently skip + unknown attributes instead of bailing out with an error in order + to be compatible with possible future attribute names. + + This is related to the discussion in bug #516425 but actually + needed for any kind of XML format extension. + 2008-05-23 Hans Breuer * gtk/gtkprintoperation.c : check surface status after ceating a pdf. diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 1db9e9bfe7..8ba5f1617a 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1235,20 +1235,9 @@ start_element_handler (GMarkupParseContext *context, { expand = !strcmp (attribute_values[i], "true"); } - else - { - gint line_number, char_number; - - g_markup_parse_context_get_position (context, - &line_number, &char_number); - g_set_error (error, - G_MARKUP_ERROR, - G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE, - _("Unknown attribute '%s' on line %d char %d"), - attribute_names[i], - line_number, char_number); - return; - } + /* else silently skip unknown attributes to be compatible with + * future additional attributes. + */ } /* Work out a name for this node. Either the name attribute, or