Fix bootstrapping with recent bits.

[upkg.git] / src / uobject / uobject.c

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 331b8ae096a487673e48da8ac66ed9808ececeda..c3cc24662ce4a69980b0086c8693c4b651f05d0a 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -1,6 +1,6 @@
 /*
  *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright © 2009-2011 Nick Bowler
+ *  Copyright © 2009-2012, 2015 Nick Bowler
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -524,15 +525,17 @@ GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx)
 {
        g_return_val_if_fail(IS_U_PKG(pkg), NULL);
 
-       const char *class, *package;
+       const struct upkg_export *export;
        GObject *obj = NULL;
        GType type;
 
-       class = upkg_export_class(U_PKG(pkg)->pkg, idx, &package);
-       if (!class)
+       export = upkg_get_export(U_PKG(pkg)->pkg, idx);
+       if (!export) {
+               u_err(pkg, "invalid package export: %lu", idx);
                return NULL;
+       }
 
-       type = u_object_module_get_class(package, class);
+       type = u_object_module_get_class(pkg, export->class);
        if (type) {
                obj = g_object_new(type, NULL);
                if (u_object_deserialize(obj, pkg, idx) != 0) {
@@ -612,18 +615,20 @@ static char *prepend_fmt(const char *prefix, const char *fmt)
 /* Logging helpers that automatically prepend the UObject class information. */
 void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap)
 {
-       g_return_if_fail(IS_U_OBJECT(o));
-       UObject *uo = U_OBJECT(o);
-       char *new_fmt = NULL;
-
-       if (uo->pkg_name) {
-               new_fmt = prepend_fmt(uo->pkg_name, fmt);
-               if (!new_fmt) {
-                       g_log(G_OBJECT_TYPE_NAME(o), level, "%s",
-                             uo->pkg_file->name);
-               } else {
+       char *new_fmt = NULL, *obj_prefix = NULL;
+
+       if (IS_U_OBJECT(o)) {
+               obj_prefix = U_OBJECT(o)->pkg_name;
+       } else if (G_IS_TYPE_MODULE(o)) {
+               obj_prefix = G_TYPE_MODULE(o)->name;
+       }
+
+       if (obj_prefix) {
+               new_fmt = prepend_fmt(obj_prefix, fmt);
+               if (!new_fmt)
+                       g_log(G_OBJECT_TYPE_NAME(o), level, "%s", obj_prefix);
+               else
                        fmt = new_fmt;
-               }
        }
 
        g_logv(G_OBJECT_TYPE_NAME(o), level, fmt, ap);