callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplified by using gimp_config_serialize_property() instead of doing it

Browse Source 
2003-02-28  Sven Neumann  <sven@gimp.org>

	* app/config/gimpconfig-serialize.c
	(gimp_config_serialize_changed_properties): simplified by using
	gimp_config_serialize_property() instead of doing it all by hand.
This commit is contained in:
Sven Neumann
2003-02-28 13:25:13 +00:00
committed by Sven Neumann
parent 2442f2f164
commit 9519de07e1
3 changed files with 16 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-02-28 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig-serialize.c
(gimp_config_serialize_changed_properties): simplified by using
gimp_config_serialize_property() instead of doing it all by hand.
2003-02-27 Manish Singh <yosh@gimp.org> 2003-02-27 Manish Singh <yosh@gimp.org>
* plug-ins/pygimp/doc/Makefile.am: make clean shouldn't clean disted * plug-ins/pygimp/doc/Makefile.am: make clean shouldn't clean disted

36
app/config/gimpconfig-serialize.c
View File

@ -121,7 +121,6 @@ gimp_config_serialize_changed_properties (GObject *new,
GList *diff; GList *diff;
GList *list; GList *list;
GString *str; GString *str;
gboolean property_written = FALSE;
g_return_val_if_fail (G_IS_OBJECT (new), FALSE); g_return_val_if_fail (G_IS_OBJECT (new), FALSE);
g_return_val_if_fail (G_IS_OBJECT (old), FALSE); g_return_val_if_fail (G_IS_OBJECT (old), FALSE);
@ -139,46 +138,20 @@ gimp_config_serialize_changed_properties (GObject *new,
for (list = diff; list; list = g_list_next (list)) for (list = diff; list; list = g_list_next (list))
{ {
GParamSpec *prop_spec; GParamSpec *prop_spec = (GParamSpec *) list->data;
GValue new_value = { 0, };
prop_spec = (GParamSpec *) list->data;
if (! (prop_spec->flags & GIMP_PARAM_SERIALIZE)) if (! (prop_spec->flags & GIMP_PARAM_SERIALIZE))
continue; continue;
g_value_init (&new_value, prop_spec->value_type);
g_object_get_property (new, prop_spec->name, &new_value);
if (property_written)
g_string_assign (str, "\n");
else
g_string_truncate (str, 0);
gimp_config_string_indent (str, indent_level); gimp_config_string_indent (str, indent_level);
g_string_append_printf (str, "(%s ", prop_spec->name); if (gimp_config_serialize_property (new, prop_spec, str, TRUE))
{
if (gimp_config_serialize_value (&new_value, str, TRUE))
{
g_string_append (str, ")\n");
property_written = TRUE;
if (write (fd, str->str, str->len) == -1) if (write (fd, str->str, str->len) == -1)
return FALSE; return FALSE;
} }
else
{
/* don't warn for empty string properties */
if (prop_spec->value_type != G_TYPE_STRING)
g_warning ("couldn't serialize property %s::%s of type %s",
g_type_name (G_TYPE_FROM_INSTANCE (new)),
prop_spec->name,
g_type_name (prop_spec->value_type));
}
g_value_unset (&new_value); g_string_truncate (str, 0);
} }
g_string_free (str, TRUE); g_string_free (str, TRUE);
@ -417,6 +390,7 @@ gimp_config_serialize_value (const GValue *value,
return FALSE; return FALSE;
} }
/** /**
* gimp_config_serialize_unknown_tokens: * gimp_config_serialize_unknown_tokens:
* @object: a #GObject. * @object: a #GObject.

36
libgimpconfig/gimpconfig-serialize.c
View File

@ -121,7 +121,6 @@ gimp_config_serialize_changed_properties (GObject *new,
GList *diff; GList *diff;
GList *list; GList *list;
GString *str; GString *str;
gboolean property_written = FALSE;
g_return_val_if_fail (G_IS_OBJECT (new), FALSE); g_return_val_if_fail (G_IS_OBJECT (new), FALSE);
g_return_val_if_fail (G_IS_OBJECT (old), FALSE); g_return_val_if_fail (G_IS_OBJECT (old), FALSE);
@ -139,46 +138,20 @@ gimp_config_serialize_changed_properties (GObject *new,
for (list = diff; list; list = g_list_next (list)) for (list = diff; list; list = g_list_next (list))
{ {
GParamSpec *prop_spec; GParamSpec *prop_spec = (GParamSpec *) list->data;
GValue new_value = { 0, };
prop_spec = (GParamSpec *) list->data;
if (! (prop_spec->flags & GIMP_PARAM_SERIALIZE)) if (! (prop_spec->flags & GIMP_PARAM_SERIALIZE))
continue; continue;
g_value_init (&new_value, prop_spec->value_type);
g_object_get_property (new, prop_spec->name, &new_value);
if (property_written)
g_string_assign (str, "\n");
else
g_string_truncate (str, 0);
gimp_config_string_indent (str, indent_level); gimp_config_string_indent (str, indent_level);
g_string_append_printf (str, "(%s ", prop_spec->name); if (gimp_config_serialize_property (new, prop_spec, str, TRUE))
{
if (gimp_config_serialize_value (&new_value, str, TRUE))
{
g_string_append (str, ")\n");
property_written = TRUE;
if (write (fd, str->str, str->len) == -1) if (write (fd, str->str, str->len) == -1)
return FALSE; return FALSE;
} }
else
{
/* don't warn for empty string properties */
if (prop_spec->value_type != G_TYPE_STRING)
g_warning ("couldn't serialize property %s::%s of type %s",
g_type_name (G_TYPE_FROM_INSTANCE (new)),
prop_spec->name,
g_type_name (prop_spec->value_type));
}
g_value_unset (&new_value); g_string_truncate (str, 0);
} }
g_string_free (str, TRUE); g_string_free (str, TRUE);
@ -417,6 +390,7 @@ gimp_config_serialize_value (const GValue *value,
return FALSE; return FALSE;
} }
/** /**
* gimp_config_serialize_unknown_tokens: * gimp_config_serialize_unknown_tokens:
* @object: a #GObject. * @object: a #GObject.