uobject: Make interface functions take UObjects directly.

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

diff --git a/src/uobject/loadable.c b/src/uobject/loadable.c
index 8ed00ffdb3ad7d0bbdc0a33a0ce3b1a7391ed446..1e41c465157c198cbd4cfd4a3641ef0cccb25c8d 100644 (file)
--- a/src/uobject/loadable.c
+++ b/src/uobject/loadable.c
@@ -16,9 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <glib-object.h>
-#include <uobject/loadable.h>
+#include "loadable.h"
 
 GType u_object_loadable_get_type(void)
 {
@@ -36,14 +34,18 @@ GType u_object_loadable_get_type(void)
        return type;
 }
 
-int u_object_load(GObject *obj)
+int u_object_load(GObject *go)
 {
-       g_return_val_if_fail(U_OBJECT_IS_LOADABLE(obj), -1);
-       return U_OBJECT_LOADABLE_GET_INTERFACE(obj)->load(obj);
+       g_return_val_if_fail(IS_U_OBJECT(go), -1);
+       g_return_val_if_fail(U_OBJECT_IS_LOADABLE(go), -1);
+
+       return U_OBJECT_LOADABLE_GET_INTERFACE(go)->load(U_OBJECT(go));
 }
 
-void u_object_unload(GObject *obj)
+void u_object_unload(GObject *go)
 {
-       g_return_if_fail(U_OBJECT_IS_LOADABLE(obj));
-       U_OBJECT_LOADABLE_GET_INTERFACE(obj)->unload(obj);
+       g_return_if_fail(IS_U_OBJECT(go));
+       g_return_if_fail(U_OBJECT_IS_LOADABLE(go));
+
+       U_OBJECT_LOADABLE_GET_INTERFACE(go)->unload(U_OBJECT(go));
 }