uobject: Make the relevant UPkg available to objects.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index e174c215b459112358c35188342552f21f76016f..202876a9b7db37fb5e473219b063d069060b33e1 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -290,7 +290,7 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                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);
@@ -312,8 +312,8 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                                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->pkg_name) {
+                                       printf(" %s", obj->pkg_name);
                                }
                        }
 
@@ -391,11 +391,10 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 
 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;
@@ -415,28 +414,13 @@ out:
 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);
        }