X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/557eccb32013460418b72bb20acd79c018a5e95a..1f5b72d49e29a126b35385a6277b411b1f97fbf5:/src/uobject/loadable.c

diff --git a/src/uobject/loadable.c b/src/uobject/loadable.c
index 6035e51..1e41c46 100644
--- a/src/uobject/loadable.c
+++ b/src/uobject/loadable.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright (C) 2009 Nick Bowler
+ *  Copyright © 2009-2011 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,16 +16,14 @@
  *  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)
 {
 	static GType type = 0;
 	if (type == 0) {
 		static const GTypeInfo info = {
-			sizeof (UObjectLoadable),
+			sizeof (UObjectLoadableIface),
 			NULL,
 			NULL,
 		};
@@ -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));
 }