uobject: Take a package/index tuple instead of a upkg_file for deserialize.

[upkg.git] / src / uobject.h

diff --git a/src/uobject.h b/src/uobject.h
index dc8e088769342676620551917af719c917ff0c03..efbe28ddf556f37083cbf78ceacabe67fde804cc 100644 (file)
--- a/src/uobject.h
+++ b/src/uobject.h
@@ -22,7 +22,6 @@
 
 #include <glib-object.h>
 #include "upkg.h"
-#include "avl.h"
 
 #define U_OBJECT_TYPE u_object_get_type()
 #define U_OBJECT(obj) \
@@ -41,6 +40,10 @@ typedef struct UObjectClass UObjectClass;
 
 struct UObject {
        GObject parent;
+
+       struct upkg *pkg;
+       struct upkg_file *pkg_file;
+       unsigned long pkg_idx;
 };
 
 struct UObjectClass {
@@ -54,6 +57,6 @@ GType u_object_get_type(void);
 const GValue *u_object_get_property(UObject *obj, const char *name);
 void u_object_set_property(UObject *obj, const char *name, const GValue *val);
 
-int u_object_deserialize(GObject *obj, struct upkg_file *f);
+int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx);
 
 #endif