procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-04 01:43:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

libgimpconfig: don't break serializing properties if one property serialization…

Browse source 
… fails.

This happens for plug-in settings storage. Serialization stops at first failed
property serialization, whereas we could store more. This feels like the last
settings feature is broken.
This commit is contained in:
Jehan 2023-07-18 16:29:47 +02:00
parent 13dcc85daa
commit ccde23ebaa
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libgimpconfig/gimpconfig-serialize.c
View file

@ -73,6 +73,7 @@ gimp_config_serialize_properties (GimpConfig *config,
GParamSpec **property_specs; GParamSpec **property_specs;
guint n_property_specs; guint n_property_specs;
guint i; guint i;
gboolean success = TRUE;
g_return_val_if_fail (G_IS_OBJECT (config), FALSE); g_return_val_if_fail (G_IS_OBJECT (config), FALSE);
@ -81,7 +82,7 @@ gimp_config_serialize_properties (GimpConfig *config,
property_specs = g_object_class_list_properties (klass, &n_property_specs); property_specs = g_object_class_list_properties (klass, &n_property_specs);
if (! property_specs) if (! property_specs)
return TRUE; return success;
for (i = 0; i < n_property_specs; i++) for (i = 0; i < n_property_specs; i++)
{ {
@ -90,13 +91,16 @@ gimp_config_serialize_properties (GimpConfig *config,
if (! (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE)) if (! (prop_spec->flags & GIMP_CONFIG_PARAM_SERIALIZE))
continue; continue;
/* Some properties may fail writing, which shouldn't break serializing
* more properties, yet final result would be a (partial) failure.
*/
if (! gimp_config_serialize_property (config, prop_spec, writer)) if (! gimp_config_serialize_property (config, prop_spec, writer))
return FALSE; success = FALSE;
} }
g_free (property_specs); g_free (property_specs);
return TRUE; return success;
} }
/** /**
@ -119,7 +123,8 @@ gimp_config_serialize_changed_properties (GimpConfig *config,
GParamSpec **property_specs; GParamSpec **property_specs;
guint n_property_specs; guint n_property_specs;
guint i; guint i;
GValue value = G_VALUE_INIT; GValue value = G_VALUE_INIT;
gboolean success = TRUE;
g_return_val_if_fail (G_IS_OBJECT (config), FALSE); g_return_val_if_fail (G_IS_OBJECT (config), FALSE);
@ -128,7 +133,7 @@ gimp_config_serialize_changed_properties (GimpConfig *config,
property_specs = g_object_class_list_properties (klass, &n_property_specs); property_specs = g_object_class_list_properties (klass, &n_property_specs);
if (! property_specs) if (! property_specs)
return TRUE; return success;
for (i = 0; i < n_property_specs; i++) for (i = 0; i < n_property_specs; i++)
{ {
@ -142,8 +147,11 @@ gimp_config_serialize_changed_properties (GimpConfig *config,
if (! g_param_value_defaults (prop_spec, &value)) if (! g_param_value_defaults (prop_spec, &value))
{ {
/* Some properties may fail writing, which shouldn't break serializing
* more properties, yet final result would be a (partial) failure.
*/
if (! gimp_config_serialize_property (config, prop_spec, writer)) if (! gimp_config_serialize_property (config, prop_spec, writer))
return FALSE; success = FALSE;
} }
g_value_unset (&value); g_value_unset (&value);
@ -151,7 +159,7 @@ gimp_config_serialize_changed_properties (GimpConfig *config,
g_free (property_specs); g_free (property_specs);
return TRUE; return success;
} }
/** /**