uobject: Namespace changes.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index ef44bf68e48a47934e43851a8a9d4ae53c4df480..a8c7c7e560ca02bb61bd66d3e36e352d4bcd2b80 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -25,10 +25,10 @@
 #include <glib-object.h>
 
 #include "upkg.h"
-#include "module.h"
-#include "uobject.h"
-#include "exportable.h"
-#include "loadable.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
+#include <uobject/loadable.h>
+#include <uobject/module.h>
 
 enum {
        MODE_INFO,
@@ -202,7 +202,7 @@ int package_export(struct upkg *pkg)
                        return EXIT_FAILURE;
                }
 
-               type = module_get_class(package, class);
+               type = u_object_module_get_class(package, class);
                if (!type) continue;
 
                obj = g_object_new(type, NULL);
@@ -253,7 +253,7 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       if (module_init() != 0)
+       if (u_object_module_init() != 0)
                return EXIT_FAILURE;
 
        pkg = upkg_fopen(argv[optind]);
@@ -272,6 +272,6 @@ int main(int argc, char **argv)
        }
 
        upkg_close(pkg);
-       module_exit();
+       u_object_module_exit();
        return rc;
 }