uobject: Make the relevant UPkg available to objects.

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

diff --git a/src/uobject/uobject.h b/src/uobject/uobject.h
index 2f709403ef1bbbc8593b2e71fb48a4ceda738c0b..00f742bd1d0b23a9696114d12cc73a8006aff911 100644 (file)
--- a/src/uobject/uobject.h
+++ b/src/uobject/uobject.h
@@ -20,6 +20,7 @@
 #define U_OBJECT_H_
 
 #include <glib-object.h>
+#include <stdarg.h>
 #include "upkg.h"
 
 #define U_TYPE_OBJECT u_object_get_type()
@@ -40,8 +41,9 @@ typedef struct UObjectClass UObjectClass;
 struct UObject {
        GObject parent;
 
-       struct upkg *pkg;
+       GTypeModule *pkg;
        struct upkg_file *pkg_file;
+       char *pkg_name;
 };
 
 struct UObjectClass {
@@ -52,8 +54,16 @@ struct UObjectClass {
 
 GType u_object_get_type(void);
 
-int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx);
+int u_object_deserialize(GObject *obj, GTypeModule *pkg, unsigned long idx);
 
-GObject *u_object_new_from_package(struct upkg *pkg, unsigned long idx);
+GObject *u_object_new_from_package(GTypeModule *pkg, unsigned long idx);
+
+/* Logging helpers for UObject class implementations. */
+void u_vlog_full(GObject *o, GLogLevelFlags level, const char *fmt, va_list ap);
+void u_log_full(GObject *o, GLogLevelFlags level, const char *fmt, ...);
+
+#define u_log(uo, ...)  u_log_full(G_OBJECT(uo), G_LOG_LEVEL_MESSAGE, __VA_ARGS__)
+#define u_warn(uo, ...) u_log_full(G_OBJECT(uo), G_LOG_LEVEL_WARNING, __VA_ARGS__)
+#define u_err(uo, ...)  u_log_full(G_OBJECT(uo), G_LOG_LEVEL_CRITICAL, __VA_ARGS__)
 
 #endif