X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/c6537566467e27e40028254b4c7da145417682cf..d323b189345af7ff63c37f7501b70d0674cb74a4:/src/loadable.c

diff --git a/src/loadable.c b/src/loadable.c
index a7c1820..6035e51 100644
--- a/src/loadable.c
+++ b/src/loadable.c
@@ -2,9 +2,9 @@
  *  upkg: tool for manipulating Unreal Tournament packages.
  *  Copyright (C) 2009 Nick Bowler
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  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
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -13,15 +13,14 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
 #include <glib-object.h>
 #include <uobject/loadable.h>
 
-GType uobject_loadable_get_type(void)
+GType u_object_loadable_get_type(void)
 {
 	static GType type = 0;
 	if (type == 0) {
@@ -37,14 +36,14 @@ GType uobject_loadable_get_type(void)
 	return type;
 }
 
-int uobject_load(GObject *obj)
+int u_object_load(GObject *obj)
 {
-	g_return_val_if_fail(UOBJECT_IS_LOADABLE(obj), -1);
-	return UOBJECT_LOADABLE_GET_INTERFACE(obj)->load(obj);
+	g_return_val_if_fail(U_OBJECT_IS_LOADABLE(obj), -1);
+	return U_OBJECT_LOADABLE_GET_INTERFACE(obj)->load(obj);
 }
 
-void uobject_unload(GObject *obj)
+void u_object_unload(GObject *obj)
 {
-	g_return_if_fail(UOBJECT_IS_LOADABLE(obj));
-	UOBJECT_LOADABLE_GET_INTERFACE(obj)->unload(obj);
+	g_return_if_fail(U_OBJECT_IS_LOADABLE(obj));
+	U_OBJECT_LOADABLE_GET_INTERFACE(obj)->unload(obj);
 }