X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/bb9c28745ae254b832805e5d41f2a5e6c3cb8f40..1f5b72d49e29a126b35385a6277b411b1f97fbf5:/src/uobject/exportable.c

diff --git a/src/uobject/exportable.c b/src/uobject/exportable.c
index e927ba6..541e698 100644
--- a/src/uobject/exportable.c
+++ b/src/uobject/exportable.c
@@ -17,15 +17,14 @@
  */
 
 #include <stdio.h>
-#include <glib-object.h>
-#include <uobject/exportable.h>
+#include "exportable.h"
 
 GType u_object_exportable_get_type(void)
 {
 	static GType type = 0;
 	if (type == 0) {
 		static const GTypeInfo info = {
-			sizeof (UObjectExportable),
+			sizeof (UObjectExportableIface),
 			NULL,
 			NULL,
 		};
@@ -36,14 +35,20 @@ GType u_object_exportable_get_type(void)
 	return type;
 }
 
-int u_object_export(GObject *obj, FILE *f)
+int u_object_export(GObject *go, FILE *f)
 {
-	g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(obj), -1);
-	return U_OBJECT_EXPORTABLE_GET_INTERFACE(obj)->export(obj, f);
+	g_return_val_if_fail(IS_U_OBJECT(go), -1);
+	g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(go), -1);
+	UObject *uo = U_OBJECT(go);
+
+	return U_OBJECT_EXPORTABLE_GET_INTERFACE(go)->export(uo, f);
 }
 
-int u_object_export_name(GObject *obj, char *buf, size_t n)
+int u_object_export_name(GObject *go, char *buf, size_t n)
 {
-	g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(obj), -1);
-	return U_OBJECT_EXPORTABLE_GET_INTERFACE(obj)->export_name(obj, buf, n);
+	g_return_val_if_fail(IS_U_OBJECT(go), -1);
+	g_return_val_if_fail(U_OBJECT_IS_EXPORTABLE(go), -1);
+	UObject *uo = U_OBJECT(go);
+
+	return U_OBJECT_EXPORTABLE_GET_INTERFACE(go)->export_name(uo, buf, n);
 }