uobject: More namespace cleanups.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index c8d2469ae7578039acf5411ce11096683d9479b5..e1a8a805f8bfbb83a37f112a66b102df04567030 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -157,15 +157,15 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
        char name[256];
        FILE *of;
 
-       if (u_object_deserialize(obj, pkg, idx) != 0) {
+       if (uobject_deserialize(obj, pkg, idx) != 0) {
                return -1;
        }
 
-       if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+       if (UOBJECT_IS_LOADABLE(obj) && uobject_load(obj) != 0) {
                return -1;
        }
 
-       u_object_export_name(obj, name, sizeof name);
+       uobject_export_name(obj, name, sizeof name);
 
        printf("exporting %s to %s\n", upkg_export_name(pkg, idx), name);
        of = fopen(name, "wb");
@@ -174,15 +174,15 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
                return -1;
        }
 
-       u_object_export(obj, of);
+       uobject_export(obj, of);
 
        if (fclose(of) != 0) {
                perror(name);
                return -1;
        }
 
-       if (U_OBJECT_IS_LOADABLE(obj)) {
-               u_object_unload(obj);
+       if (UOBJECT_IS_LOADABLE(obj)) {
+               uobject_unload(obj);
        }
 
        return 0;
@@ -206,7 +206,7 @@ int package_export(struct upkg *pkg)
                if (!type) continue;
 
                obj = g_object_new(type, NULL);
-               if (U_OBJECT_IS_EXPORTABLE(obj)) {
+               if (UOBJECT_IS_EXPORTABLE(obj)) {
                        if (export(pkg, obj, i) != 0) {
                                rc = EXIT_FAILURE;
                        }