X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/687c74b6b8cc9eb6015c279a0c757ca3c0047697..d78fbc3a4f4bdef475f85b0c1ebeaddd74cce141:/src/uobject/uobject.c

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 360dd31..9c5bfa1 100644
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -524,15 +524,17 @@ GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx)
 {
 	g_return_val_if_fail(IS_U_PKG(pkg), NULL);
 
-	const char *class, *package;
+	const struct upkg_export *export;
 	GObject *obj = NULL;
 	GType type;
 
-	class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package);
-	if (!class)
+	export = upkg_get_export(U_PKG(pkg)->pkg, idx);
+	if (!export) {
+		u_err(pkg, "invalid package export: %lu", idx);
 		return NULL;
+	}
 
-	type = u_object_module_get_class(package, class);
+	type = u_object_module_get_class(pkg, export->class);
 	if (type) {
 		obj = g_object_new(type, NULL);
 		if (u_object_deserialize(obj, pkg, idx) != 0) {