luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-13 12:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gobject-value-set-cleanups' into 'main'

Browse Source 
gobject: Some GValue setting code cleanups

See merge request GNOME/glib!3156
This commit is contained in:
Philip Withnall 2022-12-21 13:12:54 +00:00
commit 8f213524b9
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gobject/gobject.c
View File

@ -4396,18 +4396,15 @@ g_value_object_init (GValue *value)
static void static void
g_value_object_free_value (GValue *value) g_value_object_free_value (GValue *value)
{ {
if (value->data[0].v_pointer) g_clear_object ((GObject**) &value->data[0].v_pointer);
g_object_unref (value->data[0].v_pointer);
} }
static void static void
g_value_object_copy_value (const GValue *src_value, g_value_object_copy_value (const GValue *src_value,
GValue *dest_value) GValue *dest_value)
{ {
if (src_value->data[0].v_pointer) g_set_object ((GObject**) &dest_value->data[0].v_pointer,
dest_value->data[0].v_pointer = g_object_ref (src_value->data[0].v_pointer); src_value->data[0].v_pointer);
else
dest_value->data[0].v_pointer = NULL;
} }
static void static void
@ -4499,24 +4496,23 @@ g_value_set_object (GValue *value,
gpointer v_object) gpointer v_object)
{ {
GObject *old; GObject *old;
g_return_if_fail (G_VALUE_HOLDS_OBJECT (value)); g_return_if_fail (G_VALUE_HOLDS_OBJECT (value));
old = value->data[0].v_pointer; if G_UNLIKELY (value->data[0].v_pointer == v_object)
return;
old = g_steal_pointer (&value->data[0].v_pointer);
if (v_object) if (v_object)
{ {
g_return_if_fail (G_IS_OBJECT (v_object)); g_return_if_fail (G_IS_OBJECT (v_object));
g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value))); g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value)));
value->data[0].v_pointer = v_object; value->data[0].v_pointer = g_object_ref (v_object);
g_object_ref (value->data[0].v_pointer);
} }
else
value->data[0].v_pointer = NULL; g_clear_object (&old);
if (old)
g_object_unref (old);
} }
/** /**
@ -4556,18 +4552,14 @@ g_value_take_object (GValue *value,
{ {
g_return_if_fail (G_VALUE_HOLDS_OBJECT (value)); g_return_if_fail (G_VALUE_HOLDS_OBJECT (value));
if (value->data[0].v_pointer) g_clear_object ((GObject **) &value->data[0].v_pointer);
{
g_object_unref (value->data[0].v_pointer);
value->data[0].v_pointer = NULL;
}
if (v_object) if (v_object)
{ {
g_return_if_fail (G_IS_OBJECT (v_object)); g_return_if_fail (G_IS_OBJECT (v_object));
g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value))); g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value)));
value->data[0].v_pointer = v_object; /* we take over the reference count */ value->data[0].v_pointer = g_steal_pointer (&v_object);
} }
} }

1
gobject/tests/value.c
View File

@ -719,6 +719,7 @@ test_value_transform_object (void)
g_value_init (&src, types[s]); g_value_init (&src, types[s]);
g_value_set_object (&src, object); g_value_set_object (&src, object);
g_value_set_object (&src, g_value_get_object (&src));
for (d = 0; d < G_N_ELEMENTS (types); d++) for (d = 0; d < G_N_ELEMENTS (types); d++)
{ {