diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2009-12-07 11:25:54 +0100 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2009-12-29 13:13:24 +0100 |
| commit | 46d80cfacbdc23278b5b63f5dd1483fe94e5dfdf (patch) | |
| tree | 45129142398a8d0da1ff356899f2aa375c4ea4fc | |
| parent | 40d9e746b0e6d8d8ef672b3f360d8efb5bf380e0 (diff) | |
gobject: Use new _g_value_init_and_transform method
| -rw-r--r-- | gobject/gobject.c | 4 | ||||
| -rw-r--r-- | gobject/gvaluetypes.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gobject/gobject.c b/gobject/gobject.c index c0a65842a..a2e8b4b44 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -951,8 +951,8 @@ object_set_property (GObject *object, pspec = redirect; /* provide a copy to work from, convert (if necessary) and validate */ - g_value_init (&tmp_value, G_PARAM_SPEC_VALUE_TYPE (pspec)); - if (!g_value_transform (value, &tmp_value)) + /* g_value_init (&tmp_value, pspec->value_type); */ + if (!_g_value_init_and_transform (value, pspec->value_type, &tmp_value)) g_warning ("unable to set property `%s' of type `%s' from value of type `%s'", pspec->name, g_type_name (pspec->value_type), diff --git a/gobject/gvaluetypes.c b/gobject/gvaluetypes.c index 5713e4835..4e3c2ac2e 100644 --- a/gobject/gvaluetypes.c +++ b/gobject/gvaluetypes.c @@ -1139,8 +1139,7 @@ g_strdup_value_contents (const GValue *value) GValue tmp_value = { 0, }; gchar *s; - g_value_init (&tmp_value, G_TYPE_STRING); - g_value_transform (value, &tmp_value); + _g_value_init_and_transform (value, G_TYPE_STRING, &tmp_value); s = g_strescape (g_value_get_string (&tmp_value), NULL); g_value_unset (&tmp_value); if (G_VALUE_HOLDS_ENUM (value) || G_VALUE_HOLDS_FLAGS (value)) |