dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libgimpconfig: support "compat enums" in gimp_config_deserialize_enum()

Browse source 
If the enum value is not found among the nicks and names of the
GParamSpec's actual enum type, check if it has a "gimp-compat-enum"
GType attached as QData, and try the lookup there.
This commit is contained in:
Michael Natterer 2017-01-06 23:09:39 +01:00
parent 03185f8070
commit 7ab80eaa09
1 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libgimpconfig/gimpconfig-deserialize.c
View file

@ -530,11 +530,38 @@ gimp_config_deserialize_enum (GValue *value,
enum_value = g_enum_get_value_by_nick (enum_class,
scanner->value.v_identifier);
if (!enum_value)
if (! enum_value)
enum_value = g_enum_get_value_by_name (enum_class,
scanner->value.v_identifier);
if (! enum_value)
{
/* if the value was not found, check if we have a compat
* enum to find the ideitifier
*/
GQuark quark = g_quark_from_static_string ("gimp-compat-enum");
GType compat_type = (GType) g_param_spec_get_qdata (prop_spec, quark);
if (!enum_value)
if (compat_type)
{
GEnumClass *compat_class = g_type_class_ref (compat_type);
enum_value = g_enum_get_value_by_nick (compat_class,
scanner->value.v_identifier);
if (! enum_value)
enum_value = g_enum_get_value_by_name (compat_class,
scanner->value.v_identifier);
/* finally, if we found a compat value, make sure the
* same value exists in the original enum
*/
if (enum_value)
enum_value = g_enum_get_value (enum_class, enum_value->value);
g_type_class_unref (compat_class);
}
}
if (! enum_value)
{
g_scanner_error (scanner,
_("invalid value '%s' for token %s"),
@ -549,7 +576,7 @@ gimp_config_deserialize_enum (GValue *value,
enum_value = g_enum_get_value (enum_class,
(gint) scanner->value.v_int64);
if (!enum_value)
if (! enum_value)
{
g_scanner_error (scanner,
_("invalid value '%ld' for token %s"),