#include <uobject/uobject.h>
#include <uobject/module.h>
+#include <uobject/package.h>
#include "upkg.h"
#include "pack.h"
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;
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);
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;
}