X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/45c92fd47dad10216eb2589b81f35a13cd1837f5..e6d2653b6a2612ea2cee768d4dadcc3fb9315d00:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 7448aba..8fe9a2a 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -214,7 +214,7 @@ int package_info(struct upkg *pkg)
 	printf("Names:   %lu\n", pkg->name_count);
 	if (verbose >= 3) {
 		for (unsigned long i = 0; i < pkg->name_count; i++) {
-			printf("\t%s\n", upkg_get_name(pkg, i));
+			printf("%lu - %s\n", i, upkg_get_name(pkg, i));
 		}
 	}
 
@@ -296,13 +296,24 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
 			GValue val = {0};
 			char *valstr;
 
-			printf("  property %s: ", props[i]->name);
+			printf("  property %s:", props[i]->name);
 			fflush(stdout);
 
 			g_value_init(&val, props[i]->value_type);
 			g_object_get_property(obj, props[i]->name, &val);
+
+			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);
+				}
+			}
+
 			valstr = g_strdup_value_contents(&val);
-			printf("%s\n", valstr);
+			printf(" %s\n", valstr);
+			g_free(valstr);
 		}
 		free(props);
 
@@ -336,6 +347,7 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 	int rc;
 
 	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+		fprintf(stderr, "%s: failed to load export data.\n", progname);
 		return -1;
 	}