texture: Fix typo in get_property.

[upkg.git] / src / engine / texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index e9ea07d66ee9f4826b8a7dfc578083d7e0519925..03646648b1d5bc59f99e8fd070771bb207bd2cf4 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -1,9 +1,27 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  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
+ *  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,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  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, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
 #include "texture.h"
 #include "upkg.h"
 
@@ -32,15 +50,14 @@ void exportable_init(UObjectExportable *e)
 
 G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
 
-static int deserialize(UObject *o, struct upkg_file *f)
+static int deserialize(UObject *uo)
 {
-       struct texture_priv *priv = TEXTURE_GET_PRIV(o);
-       EngineTexture *t = ENGINE_TEXTURE(o);
-       const GValue *val;
+       struct texture_priv *priv = TEXTURE_GET_PRIV(uo);
+       EngineTexture *t = ENGINE_TEXTURE(uo);
 
-       U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+       U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(uo);
 
-       printf("Texture size: %lux%lu\n", t->usize, t->vsize);
+       printf("Texture size: %ux%u\n", t->usize, t->vsize);
 
        return 0;
 }
@@ -74,10 +91,10 @@ get_property(GObject *o, guint id, GValue *val, GParamSpec *spec)
 
        switch (id) {
        case PROP_USIZE:
-               g_value_set_boolean(val, t->usize);
+               g_value_set_uint(val, t->usize);
                break;
        case PROP_VSIZE:
-               g_value_set_boolean(val, t->vsize);
+               g_value_set_uint(val, t->vsize);
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID(o, id, spec);