diff options
Diffstat (limited to 'src/analysis/types/override.c')
| -rw-r--r-- | src/analysis/types/override.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/analysis/types/override.c b/src/analysis/types/override.c index 2beb934..6e48af4 100644 --- a/src/analysis/types/override.c +++ b/src/analysis/types/override.c @@ -155,8 +155,7 @@ static void g_override_type_init(GOverrideType *type) static void g_override_type_dispose(GOverrideType *type) { - if (type->base != NULL) - g_object_unref(G_OBJECT(type->base)); + g_clear_object(&type->base); G_OBJECT_CLASS(g_override_type_parent_class)->dispose(G_OBJECT(type)); @@ -265,7 +264,8 @@ static bool g_override_type_load(GOverrideType *type, GObjectStorage *storage, p result = G_DATA_TYPE_CLASS(g_override_type_parent_class)->load(G_DATA_TYPE(type), storage, pbuf); if (!result) goto exit; - result = g_serializable_object_load(G_SERIALIZABLE_OBJECT(type->base), storage, pbuf); + type->base = G_DATA_TYPE(g_object_storage_unpack_object(storage, "types", pbuf)); + result = (type->base != NULL); if (!result) goto exit; for (i = 0; i < 2; i++) @@ -324,7 +324,7 @@ static bool g_override_type_store(const GOverrideType *type, GObjectStorage *sto result = G_DATA_TYPE_CLASS(g_override_type_parent_class)->store(G_DATA_TYPE(type), storage, pbuf); if (!result) goto exit; - result = g_serializable_object_store(G_SERIALIZABLE_OBJECT(type->base), storage, pbuf); + result = g_object_storage_pack_object(storage, "types", G_SERIALIZABLE_OBJECT(type->base), pbuf); if (!result) goto exit; for (i = 0; i < 2; i++) |