sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

theme-parser: Use peek_required_version() for validation

Browse source 
When validating button functions and frame styles, the required
format version of the features used in the theme was compared to
the major version number of the supported format, limiting additions
to major theme format bumps.
Use peek_required_version() instead, so the minor version number
of the supported theme format is taken into account.

https://bugzilla.gnome.org/show_bug.cgi?id=635683
This commit is contained in:
Florian Müllner 2011-01-04 19:43:18 +01:00
parent 9f2581318a
commit 4bc8c70c75
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ui/theme-parser.c
View file

@ -2955,6 +2955,7 @@ parse_style_element (GMarkupParseContext *context,
const char *function = NULL;
const char *state = NULL;
const char *draw_ops = NULL;
gint required_version;
if (!locate_attributes (context, element_name, attribute_names, attribute_values,
error,
@ -2973,13 +2974,14 @@ parse_style_element (GMarkupParseContext *context,
return;
}
required_version = peek_required_version (info);
if (meta_theme_earliest_version_with_button (info->button_type) >
info->theme->format_version)
(guint)required_version)
{
set_error (error, context, G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
_("Button function \"%s\" does not exist in this version (%d, need %d)"),
function,
info->theme->format_version,
required_version,
meta_theme_earliest_version_with_button (info->button_type)
);
return;
@ -3828,7 +3830,7 @@ end_element_handler (GMarkupParseContext *context,
g_assert (info->style);
if (!meta_frame_style_validate (info->style,
info->theme->format_version,
peek_required_version (info),
error))
{
add_context_to_error (error, context);