X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/8afa7b7717a5a2f45182a63d043401960fdeef92..76b8a4bf05701afcd1be69ff4490a7c6be431dc4:/src/uobject/uobject.c?ds=sidebyside

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 4778292..df875b2 100644
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -27,6 +27,7 @@
 
 #include <uobject/uobject.h>
 #include <uobject/module.h>
+#include <uobject/package.h>
 #include "upkg.h"
 #include "pack.h"
 
@@ -217,7 +218,7 @@ static unsigned long deserialize_property(UObject *uo, struct prop_head *head)
 	unsigned long rc, len = 0;
 	GValue val = {0};
 
-	rc = decode_prop_header(uo->pkg, head, priv->buf, priv->nbuf);
+	rc = decode_prop_header(uo->pkg_file->pkg, head, priv->buf, priv->nbuf);
 	if (rc == 0)
 		return 0;
 	len += rc;
@@ -347,24 +348,27 @@ static char *get_obj_fullname(const struct upkg_export *e)
 	return fullname;
 }
 
-int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
+int u_object_deserialize(GObject *obj, GTypeModule *pkg, unsigned long idx)
 {
 	g_return_val_if_fail(IS_U_OBJECT(obj), -1);
+	g_return_val_if_fail(IS_U_PKG(pkg), -1);
+
 	UObject *uo = U_OBJECT(obj);
+	struct upkg *upkg = U_PKG(pkg)->pkg;
 	const struct upkg_export *e;
 	struct upkg_file *f;
 	int rc;
 
 	g_return_val_if_fail(uo->pkg_file == NULL, -1);
-	f = upkg_export_open(pkg, idx);
+	f = upkg_export_open(upkg, idx);
 	if (!f) {
 		return -1;
 	}
 
-	uo->pkg      = pkg;
+	uo->pkg = pkg;
 	uo->pkg_file = f;
 
-	e = upkg_get_export(pkg, idx);
+	e = upkg_get_export(upkg, idx);
 	if (!e)
 		return -1;
 	uo->pkg_name = get_obj_fullname(e);
@@ -380,19 +384,21 @@ int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
 	return rc;
 }
 
-GObject *u_object_new_from_package(struct upkg *upkg, unsigned long idx)
+GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx)
 {
+	g_return_val_if_fail(IS_U_PKG(pkg), NULL);
+
 	const struct upkg_export *export;
 	const char *class, *package;
 	GObject *obj = NULL;
 	GType type;
 
-	class = upkg_export_class(upkg, idx, &package);
+	class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package);
 
 	type = u_object_module_get_class(package, class);
 	if (type) {
 		obj = g_object_new(type, NULL);
-		if (u_object_deserialize(obj, upkg, idx) != 0) {
+		if (u_object_deserialize(obj, pkg, idx) != 0) {
 			g_object_unref(obj);
 			return NULL;
 		}