Changing the TYPE to make more sense and installing the dbus profile

2 files changed, 14 insertions, 7 deletions

diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index da34709..149f2a0 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -16,10 +16,11 @@ typedef struct _DbusmenuServerPrivate DbusmenuServerPrivate;
 
 struct _DbusmenuServerPrivate
 {
+	DbusmenuMenuitem * root;
 };
 
 #define DBUSMENU_SERVER_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_SERVER_TYPE, DbusmenuServerPrivate))
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_SERVER, DbusmenuServerPrivate))
 
 static void dbusmenu_server_class_init (DbusmenuServerClass *klass);
 static void dbusmenu_server_init       (DbusmenuServer *self);
@@ -38,12 +39,18 @@ dbusmenu_server_class_init (DbusmenuServerClass *klass)
 	object_class->dispose = dbusmenu_server_dispose;
 	object_class->finalize = dbusmenu_server_finalize;
 
+	dbus_g_object_type_install_info(DBUSMENU_TYPE_SERVER, &dbus_glib__dbusmenu_server_object_info);
+
 	return;
 }
 
 static void
 dbusmenu_server_init (DbusmenuServer *self)
 {
+	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(self);
+
+	priv->root = NULL;
+
 	return;
 }
 
diff --git a/libdbusmenu-glib/server.h b/libdbusmenu-glib/server.h
index 2d81587..a39b3b8 100644
--- a/libdbusmenu-glib/server.h
+++ b/libdbusmenu-glib/server.h
@@ -8,12 +8,12 @@
 
 G_BEGIN_DECLS
 
-#define DBUSMENU_SERVER_TYPE            (dbusmenu_server_get_type ())
-#define DBUSMENU_SERVER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_SERVER_TYPE, DbusmenuServer))
-#define DBUSMENU_SERVER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_SERVER_TYPE, DbusmenuServerClass))
-#define DBUSMENU_IS_SERVER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_SERVER_TYPE))
-#define DBUSMENU_IS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_SERVER_TYPE))
-#define DBUSMENU_SERVER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_SERVER_TYPE, DbusmenuServerClass))
+#define DBUSMENU_TYPE_SERVER            (dbusmenu_server_get_type ())
+#define DBUSMENU_SERVER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), DBUSMENU_TYPE_SERVER, DbusmenuServer))
+#define DBUSMENU_SERVER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), DBUSMENU_TYPE_SERVER, DbusmenuServerClass))
+#define DBUSMENU_IS_SERVER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DBUSMENU_TYPE_SERVER))
+#define DBUSMENU_IS_SERVER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUSMENU_TYPE_SERVER))
+#define DBUSMENU_SERVER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_SERVER, DbusmenuServerClass))
 
 typedef struct _DbusmenuServer      DbusmenuServer;
 typedef struct _DbusmenuServerClass DbusmenuServerClass;