diff options
| -rw-r--r-- | json-glib/json-gobject.c | 13 | ||||
| -rw-r--r-- | json-glib/tests/serialize-complex.c | 19 | ||||
| -rw-r--r-- | json-glib/tests/serialize-full.c | 3 |
3 files changed, 25 insertions, 10 deletions
diff --git a/json-glib/json-gobject.c b/json-glib/json-gobject.c index bb63467..d3b500b 100644 --- a/json-glib/json-gobject.c +++ b/json-glib/json-gobject.c @@ -198,13 +198,11 @@ json_gobject_new (GType gtype, members = json_object_get_members (object); members_left = NULL; - /* first pass: construct and construct-only properties; here - * we cannot use Serializable because we don't have an - * instance yet; we use the default implementation of - * json_deserialize_pspec() to deserialize known types + /* first pass: construct-only properties; here we cannot use Serializable + * because we don't have an instance yet; we use the default implementation + * of json_deserialize_pspec() to deserialize known types * - * FIXME - find a way to allow deserialization for these - * properties + * FIXME - find a way to allow deserialization for these properties */ construct_params = g_array_sized_new (FALSE, FALSE, sizeof (GParameter), n_members); @@ -307,8 +305,7 @@ json_gobject_new (GType gtype, continue; /* we should have dealt with these above */ - if ((pspec->flags & G_PARAM_CONSTRUCT_ONLY) || - (pspec->flags & G_PARAM_CONSTRUCT)) + if (pspec->flags & G_PARAM_CONSTRUCT_ONLY) continue; if (!(pspec->flags & G_PARAM_WRITABLE)) diff --git a/json-glib/tests/serialize-complex.c b/json-glib/tests/serialize-complex.c index 86eca85..4594fdb 100644 --- a/json-glib/tests/serialize-complex.c +++ b/json-glib/tests/serialize-complex.c @@ -33,6 +33,7 @@ struct _TestObject gboolean bar; gchar *baz; TestBoxed blah; + gdouble meh; }; struct _TestObjectClass @@ -83,7 +84,8 @@ enum PROP_FOO, PROP_BAR, PROP_BAZ, - PROP_BLAH + PROP_BLAH, + PROP_MEH }; static JsonSerializableIface *serializable_iface = NULL; @@ -167,6 +169,9 @@ test_object_set_property (GObject *gobject, g_free (TEST_OBJECT (gobject)->baz); TEST_OBJECT (gobject)->baz = g_value_dup_string (value); break; + case PROP_MEH: + TEST_OBJECT (gobject)->meh = g_value_get_double (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); } @@ -192,6 +197,9 @@ test_object_get_property (GObject *gobject, case PROP_BLAH: g_value_set_boxed (value, &(TEST_OBJECT (gobject)->blah)); break; + case PROP_MEH: + g_value_set_double (value, TEST_OBJECT (gobject)->meh); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec); } @@ -226,6 +234,12 @@ test_object_class_init (TestObjectClass *klass) g_param_spec_boxed ("blah", "Blah", "Blah", TEST_TYPE_BOXED, G_PARAM_READABLE)); + g_object_class_install_property (gobject_class, + PROP_MEH, + g_param_spec_double ("meh", "Meh", "Meh", + 0.0, 1.0, 0.0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); } static void @@ -234,6 +248,7 @@ test_object_init (TestObject *object) object->foo = 42; object->bar = TRUE; object->baz = g_strdup ("Test"); + object->meh = 0.0; object->blah.foo = object->foo; object->blah.bar = object->bar; @@ -246,6 +261,7 @@ test_serialize (void) "foo", 47, "bar", FALSE, "baz", "Hello, World!", + "meh", 0.5, NULL); JsonParser *parser = json_parser_new (); GError *error = NULL; @@ -271,6 +287,7 @@ test_serialize (void) g_assert_cmpint (json_object_get_int_member (object, "foo"), ==, 47); g_assert (!json_object_get_boolean_member (object, "bar")); g_assert_cmpstr (json_object_get_string_member (object, "baz"), ==, "Hello, World!"); + g_assert_cmpfloat (json_object_get_double_member (object, "meh"), ==, 0.5); /* blah is read-only */ g_assert (json_object_has_member (object, "blah")); diff --git a/json-glib/tests/serialize-full.c b/json-glib/tests/serialize-full.c index 704fb18..69280d4 100644 --- a/json-glib/tests/serialize-full.c +++ b/json-glib/tests/serialize-full.c @@ -300,7 +300,8 @@ test_object_class_init (TestObjectClass *klass) g_param_spec_enum ("meh", "Meh", "Meh", TEST_TYPE_ENUM, TEST_ENUM_BAR, - G_PARAM_READWRITE)); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); g_object_class_install_property (gobject_class, PROP_MAH, g_param_spec_boxed ("mah", "Mah", "Mah", |