uobject: More namespace cleanups.

[upkg.git] / src / engine / music.c

diff --git a/src/engine/music.c b/src/engine/music.c
index f64513e17d6c9ba13718ebf89e329aca8fdcf7a7..434d881fda70d1fe51f1efd2bd3989f05a4eadb6 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -21,9 +21,9 @@
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "loadable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
+#include <uobject/loadable.h>
 #include "music-module.h"
 #include "music.h"
 #include "upkg.h"
@@ -40,9 +40,9 @@ struct music_priv {
 static void exportable_init(UObjectExportable *);
 static void loadable_init(UObjectLoadable *);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_OBJECT_TYPE, 0,
-       G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_EXPORTABLE, exportable_init)
-       G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_LOADABLE, loadable_init)
+G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, UOBJECT_TYPE, 0,
+       G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_EXPORTABLE, exportable_init)
+       G_IMPLEMENT_INTERFACE(UOBJECT_TYPE_LOADABLE, loadable_init)
 );
 
 static int load(GObject *o)
@@ -129,7 +129,7 @@ static int deserialize(UObject *o, struct upkg_file *f)
        unsigned char buf[32];
        long size;
 
-       U_OBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
+       UOBJECT_CLASS(engine_music_parent_class)->deserialize(o, f);
 
        buflen = upkg_export_read(f, buf, sizeof buf);
 
@@ -177,11 +177,13 @@ static void engine_music_finalize(GObject *o)
                priv->loaded = 1;
                unload(o);
        }
+
+       G_OBJECT_CLASS(engine_music_parent_class)->finalize(o);
 }
 
 static void engine_music_class_init(EngineMusicClass *class)
 {
-       UObjectClass *uo = U_OBJECT_CLASS(class);
+       UObjectClass *uo = UOBJECT_CLASS(class);
        GObjectClass *go = G_OBJECT_CLASS(class);
        g_type_class_add_private(class, sizeof (struct music_priv));