uobject: Make interface functions take UObjects directly.

[upkg.git] / src / uobject / exportable.c

diff --git a/src/uobject/exportable.c b/src/uobject/exportable.c
index 9cb1de1240a7580fc9d0ee56f8dec983f8660d42..541e6980017a7aa7220a7e393bc6a08642739145 100644 (file)
--- a/src/uobject/exportable.c
+++ b/src/uobject/exportable.c
@@ -17,8 +17,7 @@
  */
 
 #include <stdio.h>
-#include <glib-object.h>
-#include <uobject/exportable.h>
+#include "exportable.h"
 
 GType u_object_exportable_get_type(void)
 {
@@ -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);
 }