GObject *obj;
unsigned n;
- obj = u_object_new_from_package(upkg, idx);
+ obj = u_object_new_from_package(pkg, idx);
if (!obj) {
fprintf(stderr, "%s: failed to load object.\n",
progname);
if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
UObject *obj = g_value_get_object(&val);
- /* TODO: Display full object names here. */
- if (obj->pkg_file) {
- printf(" %s", obj->pkg_file->name);
+ if (obj && obj->pkg_name) {
+ printf(" %s", obj->pkg_name);
}
}
static int object_export(GTypeModule *pkg, unsigned long idx)
{
- struct upkg *upkg = U_PKG(pkg)->pkg;
GObject *obj;
int ret = -1;
- obj = u_object_new_from_package(upkg, idx);
+ obj = u_object_new_from_package(pkg, idx);
if (!obj) {
fprintf(stderr, "%s: failed to load object.\n", progname);
return -1;
int package_export(GTypeModule *pkg)
{
struct upkg *upkg = U_PKG(pkg)->pkg;
- const char *class, *package;
GObject *obj;
- GType type;
int ret = 0;
for (unsigned i = 0; i < upkg->export_count; i++) {
- class = upkg_export_class(upkg, i, &package);
- if (!class) {
- fprintf(stderr, "error getting class information.\n");
- return -1;
- }
-
- type = u_object_module_get_class(package, class);
- if (!type)
- continue;
-
- obj = g_object_new(type, NULL);
- if (U_OBJECT_IS_EXPORTABLE(obj)) {
- if (u_object_deserialize(obj, upkg, i) != 0
- || export(pkg, obj, i) != 0) {
- ret = -1;
- }
+ obj = u_object_new_from_package(pkg, i);
+ if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) {
+ ret = -1;
}
g_object_unref(obj);
}