uobject: Rename U_OBJECT_TYPE to U_TYPE_OBJECT.

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

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 7b0a79e4e4a751f2a435582ea1ee934e30afdfbb..a64cf17718f5259b7fcdf91db37fbb545099eb49 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -28,7 +28,7 @@
 #include "pack.h"
 
 #define U_OBJECT_GET_PRIV(o) \
-       G_TYPE_INSTANCE_GET_PRIVATE(o, U_OBJECT_TYPE, struct u_object_priv)
+       G_TYPE_INSTANCE_GET_PRIVATE(o, U_TYPE_OBJECT, struct u_object_priv)
 
 enum {
        PROPERTY_BYTE = 1,
@@ -87,6 +87,34 @@ get_real_size(unsigned long *real, unsigned size, unsigned char *buf, size_t n)
        return 0;
 }
 
+static int decode_object_property(UObject *uo, GValue *val, unsigned long len)
+{
+       struct u_object_priv *priv = U_OBJECT_GET_PRIV(uo);
+       GObject *obj = NULL;
+       long index;
+       int rc;
+
+       rc = upkg_decode_index(&index, priv->buf+len, priv->nbuf-len);
+       if (rc == 0 || index == 0)
+               return -1;
+
+       if (index < 0) {
+               fprintf(stderr, "Imports not supported yet.\n");
+       } else {
+               obj = u_object_new_from_package(uo->pkg, index-1);
+       }
+
+       g_value_init(val, U_TYPE_OBJECT);
+       g_value_take_object(val, obj);
+       return 0;
+}
+
+/*
+ * XXX: I must have been smoking the happy plant when I started property
+ * decoding.  The tracking of various sizes in these functions makes no
+ * sense at all.
+ */
+
 static unsigned long
 decode_property(UObject *o, const char *name, struct upkg_file *f, unsigned long len)
 {
@@ -123,6 +151,12 @@ decode_property(UObject *o, const char *name, struct upkg_file *f, unsigned long
                g_value_set_ulong(&val, unpack_32_le(priv->buf+len));
                g_object_set_property(G_OBJECT(o), name, &val);
                break;
+       case PROPERTY_OBJECT:
+               rc = decode_object_property(o, &val, len);
+               if (rc != 0)
+                       return 0;
+               g_object_set_property(G_OBJECT(o), name, &val);
+               break;
        default:
                fprintf(stderr, "Unhandled property type %x\n", (unsigned)type);
        }