Commit 21def177 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

allow object properties to be set again if they are G_PARAM_WRITABLE.

2003-03-27  Michael Natterer  <mitch@gimp.org>

	* app/config/gimpconfig-deserialize.c
	(gimp_config_deserialize_property): allow object properties to be
	set again if they are G_PARAM_WRITABLE. Fixes active brush,
	pattern etc. deserialization.
parent 86f8c5fc
2003-03-27 Michael Natterer <mitch@gimp.org>
* app/config/gimpconfig-deserialize.c
(gimp_config_deserialize_property): allow object properties to be
set again if they are G_PARAM_WRITABLE. Fixes active brush,
pattern etc. deserialization.
2003-03-27 Christian Rose <menthos@menthos.com>
 
* configure.in: Added "yi" to ALL_LINGUAS again. Po files for
......@@ -159,8 +159,8 @@ gimp_config_deserialize_properties (GObject *object,
next = g_scanner_peek_next_token (scanner);
if (next != token &&
! (store_unknown_tokens &&
token == G_TOKEN_SYMBOL && next == G_TOKEN_IDENTIFIER))
! (store_unknown_tokens &&
token == G_TOKEN_SYMBOL && next == G_TOKEN_IDENTIFIER))
{
break;
}
......@@ -301,7 +301,8 @@ gimp_config_deserialize_property (GObject *object,
if (token == G_TOKEN_RIGHT_PAREN &&
g_scanner_peek_next_token (scanner) == token)
{
if (!G_VALUE_HOLDS_OBJECT (&value))
if (!G_VALUE_HOLDS_OBJECT (&value) ||
prop_spec->flags & G_PARAM_WRITABLE)
g_object_set_property (object, prop_spec->name, &value);
}
#if CONFIG_DEBUG
......
......@@ -159,8 +159,8 @@ gimp_config_deserialize_properties (GObject *object,
next = g_scanner_peek_next_token (scanner);
if (next != token &&
! (store_unknown_tokens &&
token == G_TOKEN_SYMBOL && next == G_TOKEN_IDENTIFIER))
! (store_unknown_tokens &&
token == G_TOKEN_SYMBOL && next == G_TOKEN_IDENTIFIER))
{
break;
}
......@@ -301,7 +301,8 @@ gimp_config_deserialize_property (GObject *object,
if (token == G_TOKEN_RIGHT_PAREN &&
g_scanner_peek_next_token (scanner) == token)
{
if (!G_VALUE_HOLDS_OBJECT (&value))
if (!G_VALUE_HOLDS_OBJECT (&value) ||
prop_spec->flags & G_PARAM_WRITABLE)
g_object_set_property (object, prop_spec->name, &value);
}
#if CONFIG_DEBUG
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment