Merge lp:~ted/libdbusmenu/kill-dbus-glib into lp:libdbusmenu/0.5

[Ted Gould]

Changes from dbus-glib to GDBus. There's an API change along the way as we have to drop GValue for GVariant as well.

[David Barth (dbarth)]

The review request is mostly for you guys to know what happens here, more than for spotting bugs.
The test suite passes, which is a strong indication of the quality of the port.

[Aurélien Gâteau (agateau)]

I don't know anything about gdbus so this is mostly a static generic review.

- You introduced an xslt file to filter out dox elements from the interface xml files, I assume this is because gdbus has a problem with them. Do they suggest other ways to document interfaces?

- There seems to be a vast amount of duplicated code for error handling. Can't this be factorized? I am thinking about blocks like these:

"""
if (priv->root == NULL) {
  g_dbus_method_invocation_return_error(invocation,
  error_quark(),
  NO_VALID_LAYOUT,
  "There currently isn't a layout in this server");
  return;
}
"""

"""
DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);

if (mi == NULL) {
  g_dbus_method_invocation_return_error(invocation,
    error_quark(),
    INVALID_MENUITEM_ID,
    "The ID supplied %d does not refer to a menu item we have",
    parent);
    return;
}
"""

I think having macros like return_if_no_layout(priv) and get_menuitem_or_return(priv, id) would make the code shorter and easier to read.

review: Approve (static)

[Mikkel Kamstrup Erlandsen (kamstrup)]

I haven't looked deeply into this, but it looks very nice at glance. Very good work Ted! :-)

Because I on principle *must* comment something on such large reviews here's some feedback. All of these are really just personal programming style preferences, so disregard to your liking:

 a) I think that all the heap allocated GVariantBuilders and GVariantIters could just as well be stack allocated. Not that the increased memchurn by heap allocations will matter much compared to the socket io.

 b) For methods that return guint32 and gint32 i prefer also storing the return values not just in a guint or gint, since technically guint and int could be 64 bit. Although it's extremely unlikely to cause problems, it's theoretically possible (I think?)

 c) In your async calls where you pass 'self' as the userdata argument I think you need to g_object_ref(self) and the unref in the async callback. The self instance may be finalized the async call returns. This may not be a problem in this particular lib, but I've had problems with that in some of my own libs in the past.

review: Approve

[lp:~ted/libdbusmenu/kill-dbus-glib]

294. By Ted Gould on 2010-12-07

Updating to trunk with introspection fixes

295. By Ted Gould on 2010-12-07

Oops, wrong version -- fixed

296. By Ted Gould on 2010-12-08

Wrong directory for jsonloader header files.

[Ted Gould (ted)]

I agree with the points, but I'm going to table them to "future work" so that we can get this merged and stop blocking people. I don't believe that any of them are blockers.

To answer a couple of questions, yeah the GMarkup XML parse isn't very robust and so that's why I needed the XSLT. Most GNOME projects are using an XSLT script to turn the DBus API into docbook. Not sure that's better really :-/

I used the heap allocated Builders and Iters because well, I didn't understand them as well when I started. I've tried to refactor most of them to be stack allocated. I also want to start using them instead of arrays to collect things like IDs that are going to be turned into Variants in the end anyway. Lots of possibilities for improvement there.

=== modified file '.bzrignore'
--- .bzrignore	2010-11-11 14:15:20 +0000
+++ .bzrignore	2010-12-08 03:19:55 +0000
@@ -182,7 +182,7 @@
 docs/libdbusmenu-gtk/reference/tmpl/menuitem.sgml.bak
 gtk-doc.make
 m4/gtk-doc.m4
-tests/dbusmenu-jsonloader.pc
+tests/dbusmenu-jsonloader-0.4.pc
 tests/libdbusmenu-jsonloader.la
 tests/libdbusmenu_jsonloader_la-json-loader.lo
 tests/test-json-server
@@ -194,6 +194,13 @@
 tests/test-glib-events
 tests/test-glib-events-client
 tests/test-glib-events-server
+libdbusmenu-glib/dbus-menu.xml.c
+libdbusmenu-glib/dbus-menu.xml.h
+libdbusmenu-glib/libdbusmenu_glib_la-dbus-menu.xml.lo
+libdbusmenu-glib/dbus-menu-clean.xml
+libdbusmenu-glib/dbus-menu-clean.xml.c
+libdbusmenu-glib/dbus-menu-clean.xml.h
+libdbusmenu-glib/libdbusmenu_glib_la-dbus-menu-clean.xml.lo
 libdbusmenu-gtk/DbusmenuGtk3-0.2.gir
 libdbusmenu-gtk/DbusmenuGtk3-0.2.tmp.gir
 libdbusmenu-gtk/DbusmenuGtk3-0.2.typelib
@@ -203,3 +210,13 @@
 libdbusmenu-gtk/libdbusmenu_gtk3_la-genericmenuitem.lo
 libdbusmenu-gtk/libdbusmenu_gtk3_la-menu.lo
 libdbusmenu-gtk/libdbusmenu_gtk3_la-menuitem.lo
+libdbusmenu-glib/Dbusmenu-Glib-0.4.gir
+libdbusmenu-glib/Dbusmenu-Glib-0.4.typelib
+libdbusmenu-glib/Dbusmenu-Glib-0.4.vapi
+libdbusmenu-glib/dbusmenu-glib-0.4.pc
+libdbusmenu-gtk/DbusmenuGtk-0.4.gir
+libdbusmenu-gtk/DbusmenuGtk-0.4.tmp.gir
+libdbusmenu-gtk/DbusmenuGtk-0.4.typelib
+libdbusmenu-gtk/DbusmenuGtk-0.4.vapi
+libdbusmenu-gtk/dbusmenu-gtk-0.4.pc
+libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc

=== modified file 'configure.ac'
--- configure.ac	2010-12-06 16:50:24 +0000
+++ configure.ac	2010-12-08 03:19:55 +0000
@@ -41,12 +41,11 @@
 # Dependencies - GLib
 ###########################
 
-GLIB_REQUIRED_VERSION=2.18
-DBUS_REQUIRED_VERSION=0.76
+GLIB_REQUIRED_VERSION=2.26
 XML_REQUIRED_VERSION=2.6
 
 PKG_CHECK_MODULES(DBUSMENUGLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                dbus-glib-1 >= $DBUS_REQUIRED_VERSION
+                                gio-2.0 >= $GLIB_REQUIRED_VERSION
                                 libxml-2.0 >= $XML_REQUIRED_VERSION)
 
 AC_SUBST(DBUSMENUGLIB_CFLAGS)
@@ -67,7 +66,6 @@
 AS_IF([test "x$with_gtk" = x3],
         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION)
          AC_SUBST(DBUSMENUGTK_CFLAGS)
          AC_SUBST(DBUSMENUGTK_LIBS)
@@ -76,7 +74,6 @@
       [test "x$with_gtk" = x2],
         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                          glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                         dbus-glib-1 >= $DBUS_REQUIRED_VERSION
                                          libxml-2.0 >= $XML_REQUIRED_VERSION)
          AC_SUBST(DBUSMENUGTK_CFLAGS)
          AC_SUBST(DBUSMENUGTK_LIBS)
@@ -129,6 +126,12 @@
 AC_PATH_PROG([VALA_API_GEN], [vapigen])
 
 ###########################
+# XSLT Processor
+###########################
+
+AC_PATH_PROG([XSLT_PROC], [xsltproc])
+
+###########################
 # Lib versioning 
 ###########################
 
@@ -168,14 +171,14 @@
 Makefile
 po/Makefile.in
 libdbusmenu-glib/Makefile
-libdbusmenu-glib/dbusmenu-glib.pc
+libdbusmenu-glib/dbusmenu-glib-0.4.pc
 libdbusmenu-gtk/Makefile
-libdbusmenu-gtk/dbusmenu-gtk.pc
-libdbusmenu-gtk/dbusmenu-gtk3.pc
+libdbusmenu-gtk/dbusmenu-gtk-0.4.pc
+libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc
 tools/Makefile
 tools/testapp/Makefile
 tests/Makefile
-tests/dbusmenu-jsonloader.pc
+tests/dbusmenu-jsonloader-0.4.pc
 docs/Makefile
 docs/libdbusmenu-glib/Makefile
 docs/libdbusmenu-glib/reference/Makefile

=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2010-12-06 16:50:24 +0000
+++ libdbusmenu-glib/Makefile.am	2010-12-08 03:19:55 +0000
@@ -2,7 +2,8 @@
 CLEANFILES = 
 
 EXTRA_DIST = \
-	dbusmenu-glib.pc.in \
+	clean-namespaces.xslt \
+	dbusmenu-glib-0.4.pc.in \
 	dbus-menu.xml \
 	client-marshal.list \
 	menuitem-marshal.list \
@@ -11,7 +12,7 @@
 lib_LTLIBRARIES = \
 	libdbusmenu-glib.la
 
-libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.1/libdbusmenu-glib/
+libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/
 
 libdbusmenu_glibinclude_HEADERS = \
 	menuitem.h \
@@ -20,8 +21,8 @@
 	client.h
 
 libdbusmenu_glib_la_SOURCES = \
-	dbusmenu-server.h \
-	dbusmenu-client.h \
+	dbus-menu-clean.xml.h \
+	dbus-menu-clean.xml.c \
 	menuitem.h \
 	menuitem.c \
 	menuitem-marshal.h \
@@ -51,12 +52,25 @@
 libdbusmenu_glib_la_LIBADD = \
 	$(DBUSMENUGLIB_LIBS)
 
-pkgconfig_DATA = dbusmenu-glib.pc
+pkgconfig_DATA = dbusmenu-glib-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
+%.xml.h: %.xml
+	echo "extern const char * $(subst -,_,$(subst .,_,$(basename $@)));" > $@
+
+%.xml.c: %.xml
+	echo "const char * $(subst -,_,$(subst .,_,$(basename $@))) = " > $@
+	sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
+	echo ";" >> $@
+
+dbus-menu-clean.xml: dbus-menu.xml
+	$(XSLT_PROC) $(srcdir)/clean-namespaces.xslt $< > $@ || (rm -f $@ && /bin/false)
+
+CLEANFILES += dbus-menu-clean.xml
+
 BUILT_SOURCES = \
-	dbusmenu-client.h \
-	dbusmenu-server.h \
+	dbus-menu-clean.xml.c \
+	dbus-menu-clean.xml.h \
 	client-marshal.h \
 	client-marshal.c \
 	menuitem-marshal.h \
@@ -64,19 +78,7 @@
 	server-marshal.h \
 	server-marshal.c
 
-dbusmenu-server.h: dbus-menu.xml
-	dbus-binding-tool \
-		--prefix=_dbusmenu_server \
-		--mode=glib-server \
-		--output=dbusmenu-server.h \
-		$(srcdir)/dbus-menu.xml
-
-dbusmenu-client.h: dbus-menu.xml
-	dbus-binding-tool \
-		--prefix=_dbusmenu_client \
-		--mode=glib-client \
-		--output=dbusmenu-client.h \
-		$(srcdir)/dbus-menu.xml
+CLEANFILES += $(BUILT_SOURCES)
 
 client-marshal.h: $(srcdir)/client-marshal.list
 	glib-genmarshal --header \
@@ -133,18 +135,18 @@
 
 introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
 
-Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
-Dbusmenu_Glib_0_2_gir_INCLUDES = \
+Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
+Dbusmenu_Glib_0_4_gir_INCLUDES = \
 	GObject-2.0
-Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
-Dbusmenu_Glib_0_2_gir_LIBS = libdbusmenu-glib.la
-Dbusmenu_Glib_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
-Dbusmenu_Glib_0_2_gir_NAMESPACE = Dbusmenu
-Dbusmenu_Glib_0_2_gir_VERSION = Glib-0.2
-Dbusmenu_Glib_0_2_gir_PACKAGES = dbusmenu-glib
-Dbusmenu_Glib_0_2_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
+Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)
+Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la
+Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
+Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
+Dbusmenu_Glib_0_4_gir_PACKAGES = dbusmenu-glib
+Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 
-INTROSPECTION_GIRS += Dbusmenu-Glib-0.2.gir
+INTROSPECTION_GIRS += Dbusmenu-Glib-0.4.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -163,10 +165,10 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = Dbusmenu-Glib-0.2.vapi
+vapi_DATA = Dbusmenu-Glib-0.4.vapi
 
-Dbusmenu-Glib-0.2.vapi: Dbusmenu-Glib-0.2.gir
-	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.2 $<
+Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir
+	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<
 
 CLEANFILES += $(vapi_DATA)
 

=== added file 'libdbusmenu-glib/clean-namespaces.xslt'
--- libdbusmenu-glib/clean-namespaces.xslt	1970-01-01 00:00:00 +0000
+++ libdbusmenu-glib/clean-namespaces.xslt	2010-12-08 03:19:55 +0000
@@ -0,0 +1,14 @@
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
+	<xsl:template match="*|@*">
+		<xsl:copy>
+			<xsl:apply-templates select="*|@*" />
+		</xsl:copy>
+	</xsl:template>
+	<xsl:template match="@dox:*|dox:*"/>
+	<xsl:template match="*">
+		<xsl:element name="{local-name()}">
+			<xsl:apply-templates select="@* | node()"/>
+		</xsl:element>
+	</xsl:template>
+</xsl:stylesheet>
+

=== modified file 'libdbusmenu-glib/client-marshal.list'
--- libdbusmenu-glib/client-marshal.list	2010-08-26 19:45:26 +0000
+++ libdbusmenu-glib/client-marshal.list	2010-12-08 03:19:55 +0000
@@ -1,2 +1,2 @@
 VOID: OBJECT, UINT
-VOID: OBJECT, STRING, POINTER, UINT, POINTER
+VOID: OBJECT, STRING, VARIANT, UINT, POINTER

=== modified file 'libdbusmenu-glib/client-menuitem.c'
--- libdbusmenu-glib/client-menuitem.c	2010-09-22 14:39:21 +0000
+++ libdbusmenu-glib/client-menuitem.c	2010-12-08 03:19:55 +0000
@@ -45,7 +45,7 @@
 static void dbusmenu_client_menuitem_init       (DbusmenuClientMenuitem *self);
 static void dbusmenu_client_menuitem_dispose    (GObject *object);
 static void dbusmenu_client_menuitem_finalize   (GObject *object);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 static void send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 G_DEFINE_TYPE (DbusmenuClientMenuitem, dbusmenu_client_menuitem, DBUSMENU_TYPE_MENUITEM);
@@ -102,10 +102,10 @@
 
 /* Passes the event signal on through the client. */
 static void
-handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	DbusmenuClientMenuitemPrivate * priv = DBUSMENU_CLIENT_MENUITEM_GET_PRIVATE(mi);
-	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, value, timestamp);
+	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp);
 	return;
 }
 

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2010-10-14 13:57:10 +0000
+++ libdbusmenu-glib/client.c	2010-12-08 03:19:55 +0000
@@ -30,7 +30,7 @@
 #include "config.h"
 #endif
 
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -39,9 +39,9 @@
 #include "menuitem.h"
 #include "menuitem-private.h"
 #include "client-menuitem.h"
-#include "dbusmenu-client.h"
 #include "server-marshal.h"
 #include "client-marshal.h"
+#include "dbus-menu-clean.xml.h"
 
 /* How many property requests should we queue before
    sending the message on dbus */
@@ -64,6 +64,8 @@
 	LAST_SIGNAL
 };
 
+typedef void (*properties_func) (GVariant * properties, GError * error, gpointer user_data);
+
 static guint signals[LAST_SIGNAL] = { 0 };
 
 struct _DbusmenuClientPrivate
@@ -73,15 +75,18 @@
 	gchar * dbus_object;
 	gchar * dbus_name;
 
-	DBusGConnection * session_bus;
-	DBusGProxy * menuproxy;
-	DBusGProxy * propproxy;
-	DBusGProxyCall * layoutcall;
+	GDBusConnection * session_bus;
+	GCancellable * session_bus_cancel;
+
+	GDBusProxy * menuproxy;
+	GCancellable * menuproxy_cancel;
+
+	GCancellable * layoutcall;
 
 	gint current_revision;
 	gint my_revision;
 
-	DBusGProxy * dbusproxy;
+	guint dbusproxy;
 
 	GHashTable * type_handlers;
 
@@ -101,7 +106,7 @@
 typedef struct _properties_listener_t properties_listener_t;
 struct _properties_listener_t {
 	gint id;
-	org_ayatana_dbusmenu_get_properties_reply callback;
+	properties_func callback;
 	gpointer user_data;
 	gboolean replied;
 };
@@ -111,12 +116,13 @@
 	DbusmenuClient * client;
 	DbusmenuMenuitem * menuitem;
 	gchar * event;
-	GValue data;
+	GVariant * variant;
 	guint timestamp;
 };
 
 
 #define DBUSMENU_CLIENT_GET_PRIVATE(o) (DBUSMENU_CLIENT(o)->priv)
+#define DBUSMENU_INTERFACE  "org.ayatana.dbusmenu"
 
 /* GObject Stuff */
 static void dbusmenu_client_class_init (DbusmenuClientClass *klass);
@@ -126,19 +132,26 @@
 static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec);
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
 /* Private Funcs */
-static void layout_update (DBusGProxy * proxy, guint revision, gint parent, DbusmenuClient * client);
-static void id_prop_update (DBusGProxy * proxy, gint id, gchar * property, GValue * value, DbusmenuClient * client);
-static void id_update (DBusGProxy * proxy, gint id, DbusmenuClient * client);
+static void layout_update (GDBusProxy * proxy, guint revision, gint parent, DbusmenuClient * client);
+static void id_prop_update (GDBusProxy * proxy, gint id, gchar * property, GVariant * value, DbusmenuClient * client);
+static void id_update (GDBusProxy * proxy, gint id, DbusmenuClient * client);
 static void build_proxies (DbusmenuClient * client);
 static gint parse_node_get_id (xmlNodePtr node);
-static DbusmenuMenuitem * parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, DBusGProxy * proxy);
+static DbusmenuMenuitem * parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, GDBusProxy * proxy);
 static gint parse_layout (DbusmenuClient * client, const gchar * layout);
-static void update_layout_cb (DBusGProxy * proxy, guint rev, gchar * xml, GError * in_error, void * data);
+static void update_layout_cb (GObject * proxy, GAsyncResult * res, gpointer data);
 static void update_layout (DbusmenuClient * client);
-static void menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data);
-static void get_properties_globber (DbusmenuClient * client, gint id, const gchar ** properties, org_ayatana_dbusmenu_get_properties_reply callback, gpointer user_data);
+static void menuitem_get_properties_cb (GVariant * properties, GError * error, gpointer data);
+static void get_properties_globber (DbusmenuClient * client, gint id, const gchar ** properties, properties_func callback, gpointer user_data);
 static GQuark error_domain (void);
-static void item_activated (DBusGProxy * proxy, gint id, guint timestamp, DbusmenuClient * client);
+static void item_activated (GDBusProxy * proxy, gint id, guint timestamp, DbusmenuClient * client);
+static void menuproxy_build_cb (GObject * object, GAsyncResult * res, gpointer user_data);
+static void menuproxy_name_changed_cb (GObject * object, GParamSpec * pspec, gpointer user_data);
+static void menuproxy_signal_cb (GDBusProxy * proxy, gchar * sender, gchar * signal, GVariant * params, gpointer user_data);
+
+/* Globals */
+static GDBusNodeInfo *            dbusmenu_node_info = NULL;
+static GDBusInterfaceInfo *       dbusmenu_interface_info = NULL;
 
 /* Build a type */
 G_DEFINE_TYPE (DbusmenuClient, dbusmenu_client, G_TYPE_OBJECT);
@@ -236,8 +249,8 @@
 	                                        G_SIGNAL_RUN_LAST,
 	                                        G_STRUCT_OFFSET (DbusmenuClientClass, event_result),
 	                                        NULL, NULL,
-	                                        _dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER,
-	                                        G_TYPE_NONE, 5, G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_POINTER);
+	                                        _dbusmenu_client_marshal_VOID__OBJECT_STRING_VARIANT_UINT_POINTER,
+	                                        G_TYPE_NONE, 5, G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_VARIANT, G_TYPE_UINT, G_TYPE_POINTER);
 
 	g_object_class_install_property (object_class, PROP_DBUSOBJECT,
 	                                 g_param_spec_string(DBUSMENU_CLIENT_PROP_DBUS_OBJECT, "DBus Object we represent",
@@ -250,6 +263,24 @@
 	                                              NULL,
 	                                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
+	if (dbusmenu_node_info == NULL) {
+		GError * error = NULL;
+
+		dbusmenu_node_info = g_dbus_node_info_new_for_xml(dbus_menu_clean_xml, &error);
+		if (error != NULL) {
+			g_error("Unable to parse DBusmenu Interface description: %s", error->message);
+			g_error_free(error);
+		}
+	}
+
+	if (dbusmenu_interface_info == NULL) {
+		dbusmenu_interface_info = g_dbus_node_info_lookup_interface(dbusmenu_node_info, DBUSMENU_INTERFACE);
+
+		if (dbusmenu_interface_info == NULL) {
+			g_error("Unable to find interface '" DBUSMENU_INTERFACE "'");
+		}
+	}
+
 	return;
 }
 
@@ -266,14 +297,17 @@
 	priv->dbus_name = NULL;
 
 	priv->session_bus = NULL;
+	priv->session_bus_cancel = NULL;
+
 	priv->menuproxy = NULL;
-	priv->propproxy = NULL;
+	priv->menuproxy_cancel = NULL;
+
 	priv->layoutcall = NULL;
 
 	priv->current_revision = 0;
 	priv->my_revision = 0;
 
-	priv->dbusproxy = NULL;
+	priv->dbusproxy = 0;
 
 	priv->type_handlers = g_hash_table_new_full(g_str_hash, g_str_equal,
 	                                            g_free, NULL);
@@ -317,7 +351,7 @@
 				if (localerror == NULL) {
 					g_set_error_literal(&localerror, error_domain(), 0, "DbusmenuClient Shutdown");
 				}
-				listener->callback(priv->menuproxy, NULL, localerror, listener->user_data);
+				listener->callback(NULL, localerror, listener->user_data);
 			}
 		}
 		if (localerror != NULL) {
@@ -329,22 +363,39 @@
 	}
 
 	if (priv->layoutcall != NULL) {
-		dbus_g_proxy_cancel_call(priv->menuproxy, priv->layoutcall);
+		g_cancellable_cancel(priv->layoutcall);
+		g_object_unref(priv->layoutcall);
 		priv->layoutcall = NULL;
 	}
+
+	/* Bring down the menu proxy, ensure we're not
+	   looking for one at the same time. */
+	if (priv->menuproxy_cancel != NULL) {
+		g_cancellable_cancel(priv->menuproxy_cancel);
+		g_object_unref(priv->menuproxy_cancel);
+		priv->menuproxy_cancel = NULL;
+	}
 	if (priv->menuproxy != NULL) {
 		g_object_unref(G_OBJECT(priv->menuproxy));
 		priv->menuproxy = NULL;
 	}
-	if (priv->propproxy != NULL) {
-		g_object_unref(G_OBJECT(priv->propproxy));
-		priv->propproxy = NULL;
-	}
-	if (priv->dbusproxy != NULL) {
-		g_object_unref(G_OBJECT(priv->dbusproxy));
-		priv->dbusproxy = NULL;
-	}
-	priv->session_bus = NULL;
+
+	if (priv->dbusproxy != 0) {
+		g_bus_unwatch_name(priv->dbusproxy);
+		priv->dbusproxy = 0;
+	}
+
+	/* Bring down the session bus, ensure we're not
+	   looking for one at the same time. */
+	if (priv->session_bus_cancel != NULL) {
+		g_cancellable_cancel(priv->session_bus_cancel);
+		g_object_unref(priv->session_bus_cancel);
+		priv->session_bus_cancel = NULL;
+	}
+	if (priv->session_bus != NULL) {
+		g_object_unref(priv->session_bus);
+		priv->session_bus = NULL;
+	}
 
 	if (priv->root != NULL) {
 		g_object_unref(G_OBJECT(priv->root));
@@ -449,47 +500,37 @@
 /* Call back from getting the group properties, now we need
    to unwind and call the various functions. */
 static void 
-get_properties_callback (DBusGProxy *proxy, GPtrArray *OUT_properties, GError *error, gpointer userdata)
+get_properties_callback (GObject *obj, GAsyncResult * res, gpointer user_data)
 {
-	GArray * listeners = (GArray *)userdata;
+	GArray * listeners = (GArray *)user_data;
 	int i;
+	GError * error = NULL;
+	GVariant * params = NULL;
 
-	#ifdef MASSIVEDEBUGGING
-	g_debug("Get properties callback: %d", OUT_properties->len);
-	#endif
+	params = g_dbus_proxy_call_finish(G_DBUS_PROXY(obj), res, &error);
 
 	if (error != NULL) {
 		/* If we get an error, all our callbacks need to hear about it. */
 		g_warning("Group Properties error: %s", error->message);
 		for (i = 0; i < listeners->len; i++) {
 			properties_listener_t * listener = &g_array_index(listeners, properties_listener_t, i);
-			listener->callback(proxy, NULL, error, listener->user_data);
+			listener->callback(NULL, error, listener->user_data);
 		}
 		g_array_free(listeners, TRUE);
 		return;
 	}
 
 	/* Callback all the folks we can find */
-	for (i = 0; i < OUT_properties->len; i++) {
-		GValueArray * varray = (GValueArray *)g_ptr_array_index(OUT_properties, i);
-
-		if (varray->n_values != 2) {
-			g_warning("Value Array is %d entries long but we expected 2.", varray->n_values);
+	GVariantIter * iter = g_variant_iter_new(g_variant_get_child_value(params, 0));
+	GVariant * child;
+	while ((child = g_variant_iter_next_value(iter)) != NULL) {
+		if (g_strcmp0(g_variant_get_type_string(child), "(ia{sv})") != 0) {
+			g_warning("Properties return signature is not '(ia{sv})' it is '%s'", g_variant_get_type_string(child));
 			continue;
 		}
 
-		GValue * vid = g_value_array_get_nth(varray, 0);
-		GValue * vproperties = g_value_array_get_nth(varray, 1);
-
-		if (G_VALUE_TYPE(vid) != G_TYPE_INT) {
-			g_warning("ID Entry not holding an int: %s", G_VALUE_TYPE_NAME(vid));
-		}
-		if (G_VALUE_TYPE(vproperties) != dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)) {
-			g_warning("Properties Entry not holding an a{sv}: %s", G_VALUE_TYPE_NAME(vproperties));
-		}
-
-		gint id = g_value_get_int(vid);
-		GHashTable * properties = g_value_get_boxed(vproperties);
+		gint id = g_variant_get_int32(g_variant_get_child_value(child, 0));
+		GVariant * properties = g_variant_get_child_value(child, 1);
 
 		properties_listener_t * listener = find_listener(listeners, 0, id);
 		if (listener == NULL) {
@@ -498,22 +539,25 @@
 		}
 
 		if (!listener->replied) {
-			listener->callback(proxy, properties, NULL, listener->user_data);
+			listener->callback(properties, NULL, listener->user_data);
 			listener->replied = TRUE;
 		} else {
 			g_warning("Odd, we've already replied to the listener on ID %d", id);
 		}
 	}
+	g_variant_iter_free(iter);
+	g_variant_unref(params);
 
 	/* Provide errors for those who we can't */
 	GError * localerror = NULL;
 	for (i = 0; i < listeners->len; i++) {
 		properties_listener_t * listener = &g_array_index(listeners, properties_listener_t, i);
 		if (!listener->replied) {
+			g_warning("Generating properties error for: %d", listener->id);
 			if (localerror == NULL) {
 				g_set_error_literal(&localerror, error_domain(), 0, "Error getting properties for ID");
 			}
-			listener->callback(proxy, NULL, localerror, listener->user_data);
+			listener->callback(NULL, localerror, listener->user_data);
 		}
 	}
 	if (localerror != NULL) {
@@ -532,7 +576,7 @@
 get_properties_idle (gpointer user_data)
 {
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(user_data);
-	//org_ayatana_dbusmenu_get_properties_async(priv->menuproxy, id, properties, callback, user_data);
+	g_return_val_if_fail(priv->menuproxy != NULL, TRUE);
 
 	if (priv->delayed_property_listeners->len == 0) {
 		g_warning("Odd, idle func got no listeners.");
@@ -540,16 +584,35 @@
 	}
 
 	/* Build up an ID list to pass */
-	GArray * idlist = g_array_new(FALSE, FALSE, sizeof(gint));
+	GVariantBuilder builder;
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+
 	gint i;
 	for (i = 0; i < priv->delayed_property_listeners->len; i++) {
-		g_array_append_val(idlist, g_array_index(priv->delayed_property_listeners, properties_listener_t, i).id);
+		g_variant_builder_add(&builder, "i", g_array_index(priv->delayed_property_listeners, properties_listener_t, i).id);
 	}
 
-	org_ayatana_dbusmenu_get_group_properties_async(priv->menuproxy, idlist, (const gchar **)priv->delayed_property_list->data, get_properties_callback, priv->delayed_property_listeners);
-
-	/* Free ID List */
-	g_array_free(idlist, TRUE);
+	GVariant * variant_ids = g_variant_builder_end(&builder);
+
+	/* Build up a prop list to pass */
+	g_variant_builder_init(&builder, g_variant_type_new("as"));
+	/* TODO: need to use delayed property list here */
+	GVariant * variant_props = g_variant_builder_end(&builder);
+
+	/* Combine them into a value for the parameter */
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
+	g_variant_builder_add_value(&builder, variant_ids);
+	g_variant_builder_add_value(&builder, variant_props);
+	GVariant * variant_params = g_variant_builder_end(&builder);
+
+	g_dbus_proxy_call(priv->menuproxy,
+	                  "GetGroupProperties",
+	                  variant_params,
+	                  G_DBUS_CALL_FLAGS_NONE,
+	                  -1,   /* timeout */
+	                  NULL, /* cancellable */
+	                  get_properties_callback,
+	                  priv->delayed_property_listeners);
 
 	/* Free properties */
 	gchar ** dataregion = (gchar **)g_array_free(priv->delayed_property_list, FALSE);
@@ -583,22 +646,20 @@
 
 	get_properties_idle(client);
 
-	dbus_g_connection_flush(priv->session_bus);
-
 	return;
 }
 
 /* A function to group all the get_properties commands to make them
    more efficient over dbus. */
 static void
-get_properties_globber (DbusmenuClient * client, gint id, const gchar ** properties, org_ayatana_dbusmenu_get_properties_reply callback, gpointer user_data)
+get_properties_globber (DbusmenuClient * client, gint id, const gchar ** properties, properties_func callback, gpointer user_data)
 {
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 	if (find_listener(priv->delayed_property_listeners, 0, id) != NULL) {
 		g_warning("Asking for properties from same ID twice: %d", id);
 		GError * localerror = NULL;
 		g_set_error_literal(&localerror, error_domain(), 0, "ID already queued");
-		callback(priv->menuproxy, NULL, localerror, user_data);
+		callback(NULL, localerror, user_data);
 		g_error_free(localerror);
 		return;
 	}
@@ -644,7 +705,7 @@
 
 /* Called when a server item wants to activate the menu */
 static void
-item_activated (DBusGProxy * proxy, gint id, guint timestamp, DbusmenuClient * client)
+item_activated (GDBusProxy * proxy, gint id, guint timestamp, DbusmenuClient * client)
 {
 	g_return_if_fail(DBUSMENU_IS_CLIENT(client));
 
@@ -668,7 +729,7 @@
 
 /* Annoying little wrapper to make the right function update */
 static void
-layout_update (DBusGProxy * proxy, guint revision, gint parent, DbusmenuClient * client)
+layout_update (GDBusProxy * proxy, guint revision, gint parent, DbusmenuClient * client)
 {
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 	priv->current_revision = revision;
@@ -681,16 +742,8 @@
 /* Signal from the server that a property has changed
    on one of our menuitems */
 static void
-id_prop_update (DBusGProxy * proxy, gint id, gchar * property, GValue * value, DbusmenuClient * client)
+id_prop_update (GDBusProxy * proxy, gint id, gchar * property, GVariant * value, DbusmenuClient * client)
 {
-	#ifdef MASSIVEDEBUGGING
-	GValue valstr = {0};
-	g_value_init(&valstr, G_TYPE_STRING);
-	g_value_transform(value, &valstr);
-	g_debug("Property change sent to client for item %d property %s value %s", id, property, g_utf8_strlen(g_value_get_string(&valstr), 50) < 25 ? g_value_get_string(&valstr) : "<too long>");
-	g_value_unset(&valstr);
-	#endif
-
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 
 	g_return_if_fail(priv->root != NULL);
@@ -703,7 +756,7 @@
 		return;
 	}
 
-	dbusmenu_menuitem_property_set_value(menuitem, property, value);
+	dbusmenu_menuitem_property_set_variant(menuitem, property, value);
 
 	return;
 }
@@ -711,7 +764,7 @@
 /* Oh, lots of updates now.  That silly server, they want
    to change all kinds of stuff! */
 static void
-id_update (DBusGProxy * proxy, gint id, DbusmenuClient * client)
+id_update (GDBusProxy * proxy, gint id, DbusmenuClient * client)
 {
 	#ifdef MASSIVEDEBUGGING
 	g_debug("Client side ID update: %d", id);
@@ -731,83 +784,39 @@
 
 /* Watches to see if our DBus savior comes onto the bus */
 static void
-dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, DbusmenuClient * client)
+dbus_owner_change (GDBusConnection * connection, const gchar * name, const gchar * owner, gpointer user_data)
 {
-	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
-	/* g_debug("Owner change: %s %s %s", name, prev, new); */
-
-	if (!(new[0] != '\0' && prev[0] == '\0')) {
-		/* If it's not someone new getting on the bus, sorry we
-		   simply just don't care.  It's not that your service isn't
-		   important to someone, just not us.  You'll find the right
-		   process someday, there's lots of processes out there. */
-		return;
-	}
-
-	if (g_strcmp0(name, priv->dbus_name)) {
-		/* Again, someone else's service. */
-		return;
-	}
+	g_return_if_fail(DBUSMENU_IS_CLIENT(user_data));
+
+	DbusmenuClient * client = DBUSMENU_CLIENT(user_data);
 
 	/* Woot!  A service for us to love and to hold for ever
 	   and ever and ever! */
 	return build_proxies(client);
 }
 
-/* This is the response to see if the name has an owner.  If
-   it does, then we should build the proxies here.  Race condition
-   check. */
-static void
-name_owner_check (DBusGProxy *proxy, gboolean has_owner, GError *error, gpointer userdata)
-{
-	if (error != NULL) {
-		return;
-	}
-
-	if (!has_owner) {
-		return;
-	}
-
-	DbusmenuClient * client = DBUSMENU_CLIENT(userdata);
-	build_proxies(client);
-	return;
-}
-
 /* This function builds the DBus proxy which will look out for
    the service coming up. */
 static void
 build_dbus_proxy (DbusmenuClient * client)
 {
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
-	GError * error = NULL;
-
-	if (priv->dbusproxy != NULL) {
-		return;
-	}
-
-	priv->dbusproxy = dbus_g_proxy_new_for_name_owner (priv->session_bus,
-	                                                   DBUS_SERVICE_DBUS,
-	                                                   DBUS_PATH_DBUS,
-	                                                   DBUS_INTERFACE_DBUS,
-	                                                   &error);
-	if (error != NULL) {
-		g_debug("Oh, that's bad.  That's really bad.  We can't get a proxy to DBus itself?  Seriously?  Here's all I know: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-
-	dbus_g_proxy_add_signal(priv->dbusproxy, "NameOwnerChanged",
-	                        G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
-	                        G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal(priv->dbusproxy, "NameOwnerChanged",
-	                            G_CALLBACK(dbus_owner_change), client, NULL);
+
+	if (priv->dbusproxy != 0) {
+		return;
+	}
+
+	priv->dbusproxy = g_bus_watch_name_on_connection(priv->session_bus,
+	                                                 priv->dbus_name,
+	                                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
+	                                                 dbus_owner_change,
+	                                                 NULL,
+	                                                 client,
+	                                                 NULL);
 
 	/* Now let's check to make sure we're not in some race
 	   condition case. */
-	org_freedesktop_DBus_name_has_owner_async(priv->dbusproxy,
-	                                          priv->dbus_name,
-	                                          name_owner_check,
-	                                          client);
+	/* TODO: Not sure how to check for names in GDBus */
 
 	return;
 }
@@ -831,7 +840,11 @@
 	}
 
 	if ((gpointer)priv->menuproxy == (gpointer)gobj_proxy) {
-		priv->layoutcall = NULL;
+		if (priv->layoutcall != NULL) {
+			g_cancellable_cancel(priv->layoutcall);
+			g_object_unref(priv->layoutcall);
+			priv->layoutcall = NULL;
+		}
 	}
 
 	priv->current_revision = 0;
@@ -841,75 +854,176 @@
 	return;
 }
 
+/* Respond to us getting the session bus (hopefully) or handle
+   the error if not */
+void
+session_bus_cb (GObject * object, GAsyncResult * res, gpointer user_data)
+{
+	GError * error = NULL;
+
+	/* NOTE: We're not using any other variables before checking
+	   the result because they could be destroyed and thus invalid */
+	GDBusConnection * bus = g_bus_get_finish(res, &error);
+	if (error != NULL) {
+		g_warning("Unable to get session bus: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	/* If this wasn't cancelled, we should be good */
+	DbusmenuClient * client = DBUSMENU_CLIENT(user_data);
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+	priv->session_bus = bus;
+
+	if (priv->session_bus_cancel != NULL) {
+		g_object_unref(priv->session_bus_cancel);
+		priv->session_bus_cancel = NULL;
+	}
+
+	/* Retry to build the proxies now that we have a bus */
+	build_proxies(DBUSMENU_CLIENT(user_data));
+
+	return;
+}
+
 /* When we have a name and an object, build the two proxies and get the
    first version of the layout */
 static void
 build_proxies (DbusmenuClient * client)
 {
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
-	GError * error = NULL;
 
 	g_return_if_fail(priv->dbus_object != NULL);
 	g_return_if_fail(priv->dbus_name != NULL);
 
-	priv->session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-	if (error != NULL) {
-		g_error("Unable to get session bus: %s", error->message);
-		g_error_free(error);
-		build_dbus_proxy(client);
-		return;
-	}
-
-	priv->propproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
-	                                                  priv->dbus_name,
-	                                                  priv->dbus_object,
-	                                                  DBUS_INTERFACE_PROPERTIES,
-	                                                  &error);
-	if (error != NULL) {
-		g_warning("Unable to get property proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
-		g_error_free(error);
-		build_dbus_proxy(client);
-		return;
-	}
-	g_object_add_weak_pointer(G_OBJECT(priv->propproxy), (gpointer *)&priv->propproxy);
-	g_signal_connect(G_OBJECT(priv->propproxy), "destroy", G_CALLBACK(proxy_destroyed), client);
-
-	priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
-	                                                  priv->dbus_name,
-	                                                  priv->dbus_object,
-	                                                  "org.ayatana.dbusmenu",
-	                                                  &error);
-	if (error != NULL) {
-		g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
-		g_error_free(error);
-		build_dbus_proxy(client);
-		return;
-	}
-	g_object_add_weak_pointer(G_OBJECT(priv->menuproxy), (gpointer *)&priv->menuproxy);
-	g_signal_connect(G_OBJECT(priv->menuproxy), "destroy", G_CALLBACK(proxy_destroyed), client);
+	if (priv->session_bus == NULL) {
+		/* We don't have the session bus yet, that's okay, but
+		   we need to handle that. */
+
+		/* If we're already running we don't need to look again. */
+		if (priv->session_bus_cancel == NULL) {
+			priv->session_bus_cancel = g_cancellable_new();
+
+			/* Async get the session bus */
+			g_bus_get(G_BUS_TYPE_SESSION, priv->session_bus_cancel, session_bus_cb, client);
+		}
+
+		/* This function exists, it'll be called again when we get
+		   the session bus so this condition will be ignored */
+		return;
+	}
+
+	/* Build us a menu proxy */
+	if (priv->menuproxy == NULL) {
+
+		/* Check to see if we're already building one */
+		if (priv->menuproxy_cancel == NULL) {
+			priv->menuproxy_cancel = g_cancellable_new();
+
+			g_dbus_proxy_new(priv->session_bus,
+			                 G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
+			                 dbusmenu_interface_info,
+			                 priv->dbus_name,
+			                 priv->dbus_object,
+			                 DBUSMENU_INTERFACE,
+			                 priv->menuproxy_cancel,
+			                 menuproxy_build_cb,
+			                 client);
+		}
+	}
+
+	return;
+}
+
+/* Callback when we know if the menu proxy can be created or
+   not and do something with it! */
+static void
+menuproxy_build_cb (GObject * object, GAsyncResult * res, gpointer user_data)
+{
+	GError * error = NULL;
+
+	/* NOTE: We're not using any other variables before checking
+	   the result because they could be destroyed and thus invalid */
+	GDBusProxy * proxy = g_dbus_proxy_new_finish(res, &error);
+	if (error != NULL) {
+		g_warning("Unable to get menu proxy: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	/* If this wasn't cancelled, we should be good */
+	DbusmenuClient * client = DBUSMENU_CLIENT(user_data);
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+	priv->menuproxy = proxy;
+
+	if (priv->menuproxy_cancel != NULL) {
+		g_object_unref(priv->menuproxy_cancel);
+		priv->menuproxy_cancel = NULL;
+	}
 
 	/* If we get here, we don't need the DBus proxy */
-	if (priv->dbusproxy != NULL) {
-		g_object_unref(G_OBJECT(priv->dbusproxy));
-		priv->dbusproxy = NULL;
-	}
-
-	dbus_g_object_register_marshaller(_dbusmenu_server_marshal_VOID__UINT_INT, G_TYPE_NONE, G_TYPE_UINT, G_TYPE_INT, G_TYPE_INVALID);
-	dbus_g_proxy_add_signal(priv->menuproxy, "LayoutUpdated", G_TYPE_UINT, G_TYPE_INT, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal(priv->menuproxy, "LayoutUpdated", G_CALLBACK(layout_update), client, NULL);
-
-	dbus_g_object_register_marshaller(_dbusmenu_server_marshal_VOID__INT_STRING_POINTER, G_TYPE_NONE, G_TYPE_INT, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-	dbus_g_proxy_add_signal(priv->menuproxy, "ItemPropertyUpdated", G_TYPE_INT, G_TYPE_STRING, G_TYPE_VALUE, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal(priv->menuproxy, "ItemPropertyUpdated", G_CALLBACK(id_prop_update), client, NULL);
-
-	dbus_g_proxy_add_signal(priv->menuproxy, "ItemUpdated", G_TYPE_INT, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal(priv->menuproxy, "ItemUpdated", G_CALLBACK(id_update), client, NULL);
-
-	dbus_g_object_register_marshaller(_dbusmenu_server_marshal_VOID__INT_UINT, G_TYPE_NONE, G_TYPE_INT, G_TYPE_UINT, G_TYPE_INVALID);
-	dbus_g_proxy_add_signal(priv->menuproxy, "ItemActivationRequested", G_TYPE_INT, G_TYPE_UINT, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal(priv->menuproxy, "ItemActivationRequested", G_CALLBACK(item_activated), client, NULL);
-
-	update_layout(client);
+	if (priv->dbusproxy != 0) {
+		g_bus_unwatch_name(priv->dbusproxy);
+		priv->dbusproxy = 0;
+	}
+
+	g_signal_connect(priv->menuproxy, "g-signal",             G_CALLBACK(menuproxy_signal_cb),       client);
+	g_signal_connect(priv->menuproxy, "notify::g-name-owner", G_CALLBACK(menuproxy_name_changed_cb), client);
+
+	gchar * name_owner = g_dbus_proxy_get_name_owner(priv->menuproxy);
+	if (name_owner != NULL) {
+		update_layout(client);
+		g_free(name_owner);
+	}
+
+	return;
+}
+
+/* Handle the case where we change owners */
+static void
+menuproxy_name_changed_cb (GObject * object, GParamSpec * pspec, gpointer user_data)
+{
+	GDBusProxy * proxy = G_DBUS_PROXY(object);
+
+	gchar * owner = g_dbus_proxy_get_name_owner(proxy);
+
+	if (owner == NULL) {
+		/* Oh, no!  We lost our owner! */
+		proxy_destroyed(G_OBJECT(proxy), user_data);
+	} else {
+		g_free(owner);
+		update_layout(DBUSMENU_CLIENT(user_data));
+	}
+
+	return;
+}
+
+/* Handle the signals out of the proxy */
+static void
+menuproxy_signal_cb (GDBusProxy * proxy, gchar * sender, gchar * signal, GVariant * params, gpointer user_data)
+{
+	g_return_if_fail(DBUSMENU_IS_CLIENT(user_data));
+	DbusmenuClient * client = DBUSMENU_CLIENT(user_data);
+
+	if (g_strcmp0(signal, "LayoutUpdated") == 0) {
+		guint revision; gint parent;
+		g_variant_get(params, "(ui)", &revision, &parent);
+		layout_update(proxy, revision, parent, client);
+	} else if (g_strcmp0(signal, "ItemPropertyUpdated") == 0) {
+		gint id; gchar * property; GVariant * value;
+		g_variant_get(params, "(isv)", &id, &property, &value);
+		id_prop_update(proxy, id, property, value, client);
+	} else if (g_strcmp0(signal, "ItemUpdated") == 0) {
+		gint id;
+		g_variant_get(params, "(i)", &id);
+		id_update(proxy, id, client);
+	} else if (g_strcmp0(signal, "ItemActivationRequested") == 0) {
+		gint id; guint timestamp;
+		g_variant_get(params, "(iu)", &id, &timestamp);
+		item_activated(proxy, id, timestamp, client);
+	} else {
+		g_warning("Received signal '%s' from menu proxy that is unknown", signal);
+	}
 
 	return;
 }
@@ -948,32 +1062,38 @@
 	return -1;
 }
 
-/* A small helper that calls _property_set on each hash table
-   entry in the properties hash. */
-static void
-get_properties_helper (gpointer key, gpointer value, gpointer data)
-{
-	dbusmenu_menuitem_property_set_value((DbusmenuMenuitem *)data, (gchar *)key, (GValue *)value);
-	return;
-}
-
 /* This is the callback for the properties on a menu item.  There
    should be all of them in the Hash, and they we use foreach to
    copy them into the menuitem.
    This isn't the most efficient way.  We can optimize this by
    somehow removing the foreach.  But that is for later.  */
 static void
-menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
+menuitem_get_properties_cb (GVariant * properties, GError * error, gpointer data)
 {
 	g_return_if_fail(DBUSMENU_IS_MENUITEM(data));
+	DbusmenuMenuitem * item = DBUSMENU_MENUITEM(data);
+
 	if (error != NULL) {
 		g_warning("Error getting properties on a menuitem: %s", error->message);
 		g_object_unref(data);
 		return;
 	}
-	g_hash_table_foreach(properties, get_properties_helper, data);
-	g_hash_table_destroy(properties);
+
+	GVariantIter * iter = g_variant_iter_new(properties);
+	gchar * key;
+	GVariant * value;
+
+	while (g_variant_iter_next(iter, "{sv}", &key, &value)) {
+		dbusmenu_menuitem_property_set_variant(item, key, value);
+
+		g_variant_unref(value);
+		g_free(key);
+	}
+
+	g_variant_iter_free(iter);
+
 	g_object_unref(data);
+
 	return;
 }
 
@@ -981,7 +1101,7 @@
    is getting recycled with the update, but we think might have prop
    changes. */
 static void
-menuitem_get_properties_replace_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
+menuitem_get_properties_replace_cb (GVariant * properties, GError * error, gpointer data)
 {
 	g_return_if_fail(DBUSMENU_IS_MENUITEM(data));
 	gboolean have_error = FALSE;
@@ -994,14 +1114,14 @@
 	GList * current_props = NULL;
 
 	for (current_props = dbusmenu_menuitem_properties_list(DBUSMENU_MENUITEM(data));
-			current_props != NULL ; current_props = g_list_next(current_props)) {
-		if (have_error || g_hash_table_lookup(properties, current_props->data) == NULL) {
-			dbusmenu_menuitem_property_remove(DBUSMENU_MENUITEM(data), (const gchar *)current_props->data);
-		}
+			current_props != NULL && have_error == FALSE;
+			current_props = g_list_next(current_props)) {
+		dbusmenu_menuitem_property_remove(DBUSMENU_MENUITEM(data), (const gchar *)current_props->data);
 	}
+	g_list_free(current_props);
 
 	if (!have_error) {
-		menuitem_get_properties_cb(proxy, properties, error, data);
+		menuitem_get_properties_cb(properties, error, data);
 	} else {
 		g_object_unref(data);
 	}
@@ -1012,7 +1132,7 @@
 /* This is a different get properites call back that also sends
    new signals.  It basically is a small wrapper around the original. */
 static void
-menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
+menuitem_get_properties_new_cb (GVariant * properties, GError * error, gpointer data)
 {
 	g_return_if_fail(data != NULL);
 	newItemPropData * propdata = (newItemPropData *)data;
@@ -1028,7 +1148,7 @@
 
 	/* Extra ref as get_properties will unref once itself */
 	g_object_ref(propdata->item);
-	menuitem_get_properties_cb (proxy, properties, error, propdata->item);
+	menuitem_get_properties_cb (properties, error, propdata->item);
 
 	gboolean handled = FALSE;
 
@@ -1064,28 +1184,39 @@
 /* Respond to the call function to make sure that the other side
    got it, or print a warning. */
 static void
-menuitem_call_cb (DBusGProxy * proxy, GError * error, gpointer userdata)
+menuitem_call_cb (GObject * proxy, GAsyncResult * res, gpointer userdata)
 {
+	GError * error = NULL;
 	event_data_t * edata = (event_data_t *)userdata;
+	GVariant * params;
+
+	params = g_dbus_proxy_call_finish(G_DBUS_PROXY(proxy), res, &error);
 
 	if (error != NULL) {
 		g_warning("Unable to call event '%s' on menu item %d: %s", edata->event, dbusmenu_menuitem_get_id(edata->menuitem), error->message);
 	}
 
-	g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, &edata->data, edata->timestamp, error, TRUE);
+	g_signal_emit(edata->client, signals[EVENT_RESULT], 0, edata->menuitem, edata->event, edata->variant, edata->timestamp, error, TRUE);
 
-	g_value_unset(&edata->data);
+	g_variant_unref(edata->variant);
 	g_free(edata->event);
 	g_object_unref(edata->menuitem);
 	g_free(edata);
 
+	if (G_UNLIKELY(error != NULL)) {
+		g_error_free(error);
+	}
+	if (G_LIKELY(params != NULL)) {
+		g_variant_unref(params);
+	}
+
 	return;
 }
 
 /* Sends the event over DBus to the server on the other side
    of the bus. */
 void
-dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, const GValue * value, guint timestamp)
+dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp)
 {
 	g_return_if_fail(DBUSMENU_IS_CLIENT(client));
 	g_return_if_fail(id >= 0);
@@ -1098,11 +1229,8 @@
 		return;
 	}
 
-	if (value == NULL) {
-		GValue internalval = {0};
-		g_value_init(&internalval, G_TYPE_INT);
-		g_value_set_int(&internalval, 0);
-		value = &internalval;
+	if (variant == NULL) {
+		variant = g_variant_new_int32(0);
 	}
 
 	event_data_t * edata = g_new0(event_data_t, 1);
@@ -1110,15 +1238,18 @@
 	edata->menuitem = mi;
 	g_object_ref(edata->menuitem);
 	edata->event = g_strdup(name);
-	g_value_init(&edata->data, G_VALUE_TYPE(value));
-	g_value_copy(value, &edata->data);
 	edata->timestamp = timestamp;
+	edata->variant = variant;
+	g_variant_ref(variant);
 
-	DBusGAsyncData *stuff;
-	stuff = g_slice_new (DBusGAsyncData);
-	stuff->cb = G_CALLBACK (menuitem_call_cb);
-	stuff->userdata = edata;
-	dbus_g_proxy_begin_call_with_timeout (priv->menuproxy, "Event", org_ayatana_dbusmenu_event_async_callback, stuff, _dbus_glib_async_data_free, 1000, G_TYPE_INT, id, G_TYPE_STRING, name, G_TYPE_VALUE, value, G_TYPE_UINT, timestamp, G_TYPE_INVALID);
+	g_dbus_proxy_call(priv->menuproxy,
+	                  "Event",
+	                  g_variant_new("(isvu)", id, name, variant, timestamp),
+	                  G_DBUS_CALL_FLAGS_NONE,
+	                  1000,   /* timeout */
+	                  NULL, /* cancellable */
+	                  menuitem_call_cb,
+	                  edata);
 
 	return;
 }
@@ -1133,14 +1264,22 @@
 /* Reports errors and responds to update request that were a result
    of sending the about to show signal. */
 static void
-about_to_show_cb (DBusGProxy * proxy, gboolean need_update, GError * error, gpointer userdata)
+about_to_show_cb (GObject * proxy, GAsyncResult * res, gpointer userdata)
 {
+	gboolean need_update = FALSE;
+	GError * error = NULL;
 	about_to_show_t * data = (about_to_show_t *)userdata;
+	GVariant * params = NULL;
+
+	params = g_dbus_proxy_call_finish(G_DBUS_PROXY(proxy), res, &error);
 
 	if (error != NULL) {
 		g_warning("Unable to send about_to_show: %s", error->message);
 		/* Note: we're just ensuring only the callback gets called */
 		need_update = FALSE;
+	} else {
+		g_variant_get(params, "(b)", &need_update);
+		g_variant_unref(params);
 	}
 
 	/* If we need to update, do that first. */
@@ -1171,7 +1310,14 @@
 	data->cb_data = cb_data;
 	g_object_ref(client);
 
-	org_ayatana_dbusmenu_about_to_show_async (priv->menuproxy, id, about_to_show_cb, data);
+	g_dbus_proxy_call(priv->menuproxy,
+	                  "AboutToShow",
+	                  g_variant_new("(i)", id),
+	                  G_DBUS_CALL_FLAGS_NONE,
+	                  -1,   /* timeout */
+	                  NULL, /* cancellable */
+	                  about_to_show_cb,
+	                  data);
 	return;
 }
 
@@ -1217,7 +1363,7 @@
 /* Parse recursively through the XML and make it into
    objects as need be */
 static DbusmenuMenuitem *
-parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, DBusGProxy * proxy)
+parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, GDBusProxy * proxy)
 {
 	/* First verify and figure out what we've got */
 	gint id = parse_node_get_id(node);
@@ -1390,24 +1536,41 @@
 
 /* When the layout property returns, here's where we take care of that. */
 static void
-update_layout_cb (DBusGProxy * proxy, guint rev, gchar * xml, GError * error, void * data)
+update_layout_cb (GObject * proxy, GAsyncResult * res, gpointer data)
 {
+	GError * error = NULL;
+	GVariant * params = NULL;
+
+	params = g_dbus_proxy_call_finish(G_DBUS_PROXY(proxy), res, &error);
+
+	if (error != NULL) {
+		g_warning("Getting layout failed: %s", error->message);
+		return;
+	}
+
+	guint rev;
+	gchar * xml;
+
+	g_variant_get(params, "(us)", &rev, &xml);
+	g_variant_unref(params);
+
 	DbusmenuClient * client = DBUSMENU_CLIENT(data);
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 
-	if (error != NULL) {
-		g_warning("Getting layout failed on client %s object %s: %s", priv->dbus_name, priv->dbus_object, error->message);
-		return;
-	}
+	guint parseable = parse_layout(client, xml);
+	g_free(xml);
 
-	if (!parse_layout(client, xml)) {
+	if (parseable == 0) {
 		g_warning("Unable to parse layout!");
 		return;
 	}
 
 	priv->my_revision = rev;
 	/* g_debug("Root is now: 0x%X", (unsigned int)priv->root); */
-	priv->layoutcall = NULL;
+	if (priv->layoutcall != NULL) {
+		g_object_unref(priv->layoutcall);
+		priv->layoutcall = NULL;
+	}
 	#ifdef MASSIVEDEBUGGING
 	g_debug("Client signaling layout has changed.");
 	#endif 
@@ -1433,14 +1596,26 @@
 		return;
 	}
 
+	gchar * name_owner = g_dbus_proxy_get_name_owner(priv->menuproxy);
+	if (name_owner == NULL) {
+		return;
+	}
+	g_free(name_owner);
+
 	if (priv->layoutcall != NULL) {
 		return;
 	}
 
-	priv->layoutcall = org_ayatana_dbusmenu_get_layout_async(priv->menuproxy,
-	                                                         0, /* Parent is the root */
-	                                                         update_layout_cb,
-	                                                         client);
+	priv->layoutcall = g_cancellable_new();
+
+	g_dbus_proxy_call(priv->menuproxy,
+	                  "GetLayout",
+	                  g_variant_new("(i)", 0), /* root */
+	                  G_DBUS_CALL_FLAGS_NONE,
+	                  -1,   /* timeout */
+	                  priv->layoutcall, /* cancellable */
+	                  update_layout_cb,
+	                  client);
 
 	return;
 }
@@ -1493,10 +1668,6 @@
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 
-	if (priv->propproxy == NULL) {
-		return NULL;
-	}
-
 	#ifdef MASSIVEDEBUGGING
 	g_debug("Client get root: %X", (guint)priv->root);
 	#endif

=== modified file 'libdbusmenu-glib/client.h'
--- libdbusmenu-glib/client.h	2010-10-12 21:14:21 +0000
+++ libdbusmenu-glib/client.h	2010-12-08 03:19:55 +0000
@@ -84,7 +84,7 @@
 	void (*root_changed) (DbusmenuMenuitem * newroot);
 	void (*new_menuitem) (DbusmenuMenuitem * newitem);
 	void (*item_activate) (DbusmenuMenuitem * item, guint timestamp);
-	void (*event_result) (DbusmenuMenuitem * item, gchar * event, GValue * data, guint timestamp, GError * error);
+	void (*event_result) (DbusmenuMenuitem * item, gchar * event, GVariant * data, guint timestamp, GError * error);
 
 	/*< Private >*/
 	void (*reserved1) (void);
@@ -122,7 +122,7 @@
 void                 dbusmenu_client_send_event        (DbusmenuClient * client,
                                                         gint id,
                                                         const gchar * name,
-                                                        const GValue * value,
+                                                        GVariant * variant,
                                                         guint timestamp);
 void                 dbusmenu_client_send_about_to_show(DbusmenuClient * client,
                                                         gint id,

=== renamed file 'libdbusmenu-glib/dbusmenu-glib.pc.in' => 'libdbusmenu-glib/dbusmenu-glib-0.4.pc.in'
--- libdbusmenu-glib/dbusmenu-glib.pc.in	2009-03-25 20:00:33 +0000
+++ libdbusmenu-glib/dbusmenu-glib-0.4.pc.in	2010-12-08 03:19:55 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.1
+Cflags: -I${includedir}/libdbusmenu-0.4
 Requires: dbus-glib-1
 Libs: -L${libdir} -ldbusmenu-glib
 

=== modified file 'libdbusmenu-glib/menuitem-marshal.list'
--- libdbusmenu-glib/menuitem-marshal.list	2010-01-22 20:10:27 +0000
+++ libdbusmenu-glib/menuitem-marshal.list	2010-12-08 03:19:55 +0000
@@ -1,4 +1,4 @@
-VOID: STRING, POINTER
+VOID: STRING, VARIANT
 VOID: OBJECT, UINT, UINT
 VOID: OBJECT, UINT
 VOID: OBJECT

=== modified file 'libdbusmenu-glib/menuitem-private.h'
--- libdbusmenu-glib/menuitem-private.h	2010-04-15 04:40:22 +0000
+++ libdbusmenu-glib/menuitem-private.h	2010-12-08 03:19:55 +0000
@@ -36,6 +36,7 @@
 void dbusmenu_menuitem_buildxml (DbusmenuMenuitem * mi, GPtrArray * array);
 gboolean dbusmenu_menuitem_realized (DbusmenuMenuitem * mi);
 void dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi);
+GVariant * dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi);
 
 G_END_DECLS
 

=== modified file 'libdbusmenu-glib/menuitem-proxy.c'
--- libdbusmenu-glib/menuitem-proxy.c	2010-10-12 21:26:33 +0000
+++ libdbusmenu-glib/menuitem-proxy.c	2010-12-08 03:19:55 +0000
@@ -56,7 +56,7 @@
 static void dbusmenu_menuitem_proxy_finalize   (GObject *object);
 static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec);
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp);
 static void add_menuitem (DbusmenuMenuitemProxy * pmi, DbusmenuMenuitem * mi);
 static void remove_menuitem (DbusmenuMenuitemProxy * pmi);
 
@@ -162,21 +162,21 @@
 /* Takes the event and passes it along to the item that we're
    playing proxy for. */
 static void
-handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	g_return_if_fail(DBUSMENU_IS_MENUITEM_PROXY(mi));
 	DbusmenuMenuitemProxyPrivate * priv = DBUSMENU_MENUITEM_PROXY_GET_PRIVATE(mi);
 	g_return_if_fail(priv->mi != NULL);
-	return dbusmenu_menuitem_handle_event(priv->mi, name, value, timestamp);
+	return dbusmenu_menuitem_handle_event(priv->mi, name, variant, timestamp);
 }
 
 /* Watches a property change and makes sure to put that value
    into our property list. */
 static void
-proxy_item_property_changed (DbusmenuMenuitem * mi, gchar * property, GValue * value, gpointer user_data)
+proxy_item_property_changed (DbusmenuMenuitem * mi, gchar * property, GVariant * variant, gpointer user_data)
 {
 	DbusmenuMenuitemProxy * pmi = DBUSMENU_MENUITEM_PROXY(user_data);
-	dbusmenu_menuitem_property_set_value(DBUSMENU_MENUITEM(pmi), property, value);
+	dbusmenu_menuitem_property_set_variant(DBUSMENU_MENUITEM(pmi), property, variant);
 	return;
 }
 
@@ -273,7 +273,7 @@
 	GList * prop;
 	for (prop = props; prop != NULL; prop = g_list_next(prop)) {
 		gchar * prop_name = (gchar *)prop->data;
-		dbusmenu_menuitem_property_set_value(DBUSMENU_MENUITEM(pmi), prop_name, dbusmenu_menuitem_property_get_value(priv->mi, prop_name));
+		dbusmenu_menuitem_property_set_variant(DBUSMENU_MENUITEM(pmi), prop_name, dbusmenu_menuitem_property_get_variant(priv->mi, prop_name));
 	}
 	g_list_free(props);
 

=== modified file 'libdbusmenu-glib/menuitem.c'
--- libdbusmenu-glib/menuitem.c	2010-10-12 21:21:44 +0000
+++ libdbusmenu-glib/menuitem.c	2010-12-08 03:19:55 +0000
@@ -94,7 +94,7 @@
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
 static void g_value_transform_STRING_BOOLEAN (const GValue * in, GValue * out);
 static void g_value_transform_STRING_INT (const GValue * in, GValue * out);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 static void send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 /* GObject stuff */
@@ -129,8 +129,8 @@
 	                                           G_SIGNAL_RUN_LAST,
 	                                           G_STRUCT_OFFSET(DbusmenuMenuitemClass, property_changed),
 	                                           NULL, NULL,
-	                                           _dbusmenu_menuitem_marshal_VOID__STRING_POINTER,
-	                                           G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER);
+	                                           _dbusmenu_menuitem_marshal_VOID__STRING_VARIANT,
+	                                           G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_VARIANT);
 	/**
 		DbusmenuMenuitem::item-activated:
 		@arg0: The #DbusmenuMenuitem object.
@@ -271,15 +271,12 @@
 
 static gint menuitem_next_id = 1;
 
-/* A small little function to both clear the insides of a 
-   value as well as the memory it itself uses. */
+/* Make the unref function match the prototype need for the
+   hashtable destructor */
 static void
-_g_value_free (gpointer data)
+_g_variant_unref (gpointer data)
 {
-	if (data == NULL) return;
-	GValue * value = (GValue*)data;
-	g_value_unset(value);
-	g_free(data);
+	g_variant_unref((GVariant *)data);
 	return;
 }
 
@@ -295,7 +292,7 @@
 	priv->id = -1; 
 	priv->children = NULL;
 
-	priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _g_value_free);
+	priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, _g_variant_unref);
 
 	priv->root = FALSE;
 	priv->realized = FALSE;
@@ -380,7 +377,7 @@
 
 /* Handles the activate event if it is sent. */
 static void
-handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp)
 {
 	if (g_strcmp0(name, "clicked") == 0) {
 		g_signal_emit(G_OBJECT(mi), signals[ITEM_ACTIVATED], 0, timestamp, TRUE);
@@ -916,10 +913,8 @@
 gboolean
 dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value)
 {
-	GValue val = {0};
-	g_value_init(&val, G_TYPE_STRING);
-	g_value_set_static_string(&val, value);
-	return dbusmenu_menuitem_property_set_value(mi, property, &val);
+	GVariant * variant = g_variant_new("s", value);
+	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
 /**
@@ -940,10 +935,8 @@
 gboolean
 dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value)
 {
-	GValue val = {0};
-	g_value_init(&val, G_TYPE_BOOLEAN);
-	g_value_set_boolean(&val, value);
-	return dbusmenu_menuitem_property_set_value(mi, property, &val);
+	GVariant * variant = g_variant_new("b", value);
+	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
 /**
@@ -964,14 +957,12 @@
 gboolean
 dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value)
 {
-	GValue val = {0};
-	g_value_init(&val, G_TYPE_INT);
-	g_value_set_int(&val, value);
-	return dbusmenu_menuitem_property_set_value(mi, property, &val);
+	GVariant * variant = g_variant_new("i", value);
+	return dbusmenu_menuitem_property_set_variant(mi, property, variant);
 }
 
 /**
-	dbusmenu_menuitem_property_set:
+	dbusmenu_menuitem_property_set_variant:
 	@mi: The #DbusmenuMenuitem to set the property on.
 	@property: Name of the property to set.
 	@value: The value of the property.
@@ -986,37 +977,30 @@
 	Return value:  A boolean representing if the property value was set.
 */
 gboolean
-dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value)
+dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value)
 {
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
 	g_return_val_if_fail(property != NULL, FALSE);
-	g_return_val_if_fail(G_IS_VALUE(value), FALSE);
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
-	/* g_debug("Setting a property.  ID: %d  Prop: %s  Value: %s", priv->id, property, value); */
-
-	#if 0
-	gpointer lookup = g_hash_table_lookup(priv->properties, property);
-	if (g_strcmp0((gchar *)lookup, value) == 0) {
-		/* The value is the same as the value currently in the
-		   table so we don't really care.  Just say everything's okay */
-		return TRUE;
-	}
-	#endif
 
 	gchar * lprop = g_strdup(property);
-	GValue * lval = g_new0(GValue, 1);
-	g_value_init(lval, G_VALUE_TYPE(value));
-	g_value_copy(value, lval);
-
-	g_hash_table_replace(priv->properties, lprop, lval);
-	#ifdef MASSIVEDEBUGGING
-	gchar * valstr = g_strdup_value_contents(lval);
-	g_debug("Menuitem %d (%s) signalling property '%s' changed to '%s'", ID(mi), LABEL(mi), property, g_utf8_strlen(valstr, 50) < 25 ? valstr : "<too long>");
-	g_free(valstr);
-	#endif
-
-	g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, lprop, lval, TRUE);
+	g_variant_ref(value);
+
+	gboolean replaced = FALSE;
+	gpointer currentval = g_hash_table_lookup(priv->properties, lprop);
+	if (currentval == NULL || !g_variant_equal((GVariant*)currentval, value)) {
+		g_hash_table_replace(priv->properties, lprop, value);
+		replaced = TRUE;
+	}
+
+	/* NOTE: The actual value is invalid at this point
+	   becuse it has been unref'd when replaced in the hash
+	   table.  But the fact that there was a value is
+	   the imporant part. */
+	if (currentval == NULL || replaced) {
+		g_signal_emit(G_OBJECT(mi), signals[PROPERTY_CHANGED], 0, lprop, value, TRUE);
+	}
 
 	return TRUE;
 }
@@ -1037,14 +1021,14 @@
 const gchar *
 dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 {
-	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
-	if (value == NULL) return NULL;
-	if (G_VALUE_TYPE(value) != G_TYPE_STRING) return NULL;
-	return g_value_get_string(value);
+	GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
+	if (variant == NULL) return NULL;
+	if (!g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) return NULL;
+	return g_variant_get_string(variant, NULL);
 }
 
 /**
-	dbusmenu_menuitem_property_get_value:
+	dbusmenu_menuitem_property_get_variant:
 	@mi: The #DbusmenuMenuitem to look for the property on.
 	@property: The property to grab.
 
@@ -1052,17 +1036,17 @@
 	it exits.  #NULL will be returned if the property doesn't
 	exist.
 
-	Return value: A GValue for the property.
+	Return value: A GVariant for the property.
 */
-const GValue *
-dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property)
+GVariant *
+dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property)
 {
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
 	g_return_val_if_fail(property != NULL, NULL);
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 
-	return (const GValue *)g_hash_table_lookup(priv->properties, property);
+	return (GVariant *)g_hash_table_lookup(priv->properties, property);
 }
 
 /**
@@ -1078,19 +1062,25 @@
 gboolean
 dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property)
 {
-	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
-	if (value == NULL) return FALSE;
-	if (G_VALUE_TYPE(value) != G_TYPE_BOOLEAN) {
-		if (g_value_type_transformable(G_VALUE_TYPE(value), G_TYPE_BOOLEAN)) {
-			GValue boolval = {0};
-			g_value_init(&boolval, G_TYPE_BOOLEAN);
-			g_value_transform(value, &boolval);
-			return g_value_get_boolean(&boolval);
+	GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
+	if (variant == NULL) return FALSE;
+
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_BOOLEAN)) {
+		return g_variant_get_boolean(variant);
+	}
+
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
+		const gchar * string = g_variant_get_string(variant, NULL);
+
+		if (!g_strcmp0(string, "TRUE") || !g_strcmp0(string, "true") || !g_strcmp0(string, "True")) {
+			return TRUE;
 		} else {
 			return FALSE;
 		}
 	}
-	return g_value_get_boolean(value);
+
+	g_warning("Property '%s' has been requested as an boolean but is not one.", property);
+	return FALSE;
 }
 
 /**
@@ -1106,19 +1096,20 @@
 gint
 dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property)
 {
-	const GValue * value = dbusmenu_menuitem_property_get_value(mi, property);
-	if (value == NULL) return 0;
-	if (G_VALUE_TYPE(value) != G_TYPE_INT) {
-		if (g_value_type_transformable(G_VALUE_TYPE(value), G_TYPE_INT)) {
-			GValue intval = {0};
-			g_value_init(&intval, G_TYPE_INT);
-			g_value_transform(value, &intval);
-			return g_value_get_int(&intval);
-		} else {
-			return 0;
-		}
-	}
-	return g_value_get_int(value);
+	GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
+	if (variant == NULL) return 0;
+
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_INT32)) {
+		return g_variant_get_int32(variant);
+	}
+
+	if (g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE_STRING)) {
+		const gchar * string = g_variant_get_string(variant, NULL);
+		return atoi(string);
+	}
+
+	g_warning("Property '%s' has been requested as an int but is not one.", property);
+	return 0;
 }
 
 
@@ -1220,6 +1211,45 @@
 	return ret;
 }
 
+/* Looks at each value in the hashtable and tries to convert it
+   into a variant and add it to our variant builder */
+static void
+variant_helper (gpointer in_key, gpointer in_value, gpointer user_data)
+{
+	g_variant_builder_add((GVariantBuilder *)user_data, "{sv}", in_key, in_value);
+	return;
+}
+
+/**
+	dbusmenu_menuitem_properties_variant:
+	@mi: #DbusmenuMenuitem to get properties from
+
+	Grabs the properties of the menuitem as a GVariant with the
+	type "a{sv}".
+
+	Return Value: A GVariant of type "a{sv}" or NULL on error.
+*/
+GVariant *
+dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL);
+
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+
+	GVariant * final_variant = NULL;
+
+	if (g_hash_table_size(priv->properties) > 0) {
+		GVariantBuilder builder;
+		g_variant_builder_init(&builder, g_variant_type_new("a{sv}"));
+
+		g_hash_table_foreach(priv->properties, variant_helper, &builder);
+
+		final_variant = g_variant_builder_end(&builder);
+	}
+
+	return final_variant;
+}
+
 /**
 	dbusmenu_menuitem_set_root:
 	@mi: #DbusmenuMenuitem to set whether it's root
@@ -1332,7 +1362,7 @@
 	dbusmenu_menuitem_handle_event:
 	@mi: The #DbusmenuMenuitem to send the signal on.
 	@name: The name of the signal
-	@value: A value that could be set for the event
+	@variant: A value that could be set for the event
 	@timestamp: The timestamp of when the event happened
 
 	This function is called to create an event.  It is likely
@@ -1348,7 +1378,7 @@
 	reason not to.
 */
 void
-dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp)
+dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
 	#ifdef MASSIVEDEBUGGING
@@ -1357,7 +1387,7 @@
 	DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);
 
 	if (class->handle_event != NULL) {
-		return class->handle_event(mi, name, value, timestamp);
+		return class->handle_event(mi, name, variant, timestamp);
 	}
 	return;
 }

=== modified file 'libdbusmenu-glib/menuitem.h'
--- libdbusmenu-glib/menuitem.h	2010-10-12 21:14:21 +0000
+++ libdbusmenu-glib/menuitem.h	2010-12-08 03:19:55 +0000
@@ -145,7 +145,7 @@
 	GObjectClass parent_class;
 
 	/* Signals */
-	void (*property_changed) (gchar * property, GValue * value);
+	void (*property_changed) (gchar * property, GVariant * value);
 	void (*item_activated) (guint timestamp);
 	void (*child_added) (DbusmenuMenuitem * child, guint position);
 	void (*child_removed) (DbusmenuMenuitem * child);
@@ -154,7 +154,7 @@
 
 	/* Virtual functions */
 	dbusmenu_menuitem_buildxml_slot_t buildxml;
-	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 	void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 	void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpointer cb_data);
@@ -188,11 +188,11 @@
 DbusmenuMenuitem * dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id);
 
 gboolean dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value);
-gboolean dbusmenu_menuitem_property_set_value (DbusmenuMenuitem * mi, const gchar * property, const GValue * value);
+gboolean dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value);
 gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value);
 gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value);
 const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property);
-const GValue * dbusmenu_menuitem_property_get_value (DbusmenuMenuitem * mi, const gchar * property);
+GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property);
 gboolean dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property);
 gint dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property);
 gboolean dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property);
@@ -204,7 +204,7 @@
 gboolean dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi);
 
 void dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem * mi, gpointer data), gpointer data);
-void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, const GValue * value, guint timestamp);
+void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
 void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 void dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp);

=== modified file 'libdbusmenu-glib/server-marshal.list'
--- libdbusmenu-glib/server-marshal.list	2010-07-20 21:15:25 +0000
+++ libdbusmenu-glib/server-marshal.list	2010-12-08 03:19:55 +0000
@@ -1,3 +1,3 @@
-VOID: INT, STRING, POINTER
+VOID: INT, STRING, VARIANT
 VOID: UINT, INT
 VOID: INT, UINT

=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2010-10-12 21:22:56 +0000
+++ libdbusmenu-glib/server.c	2010-12-08 03:19:55 +0000
@@ -30,27 +30,18 @@
 #include "config.h"
 #endif
 
+#include <gio/gio.h>
+
 #include "menuitem-private.h"
 #include "server.h"
 #include "server-marshal.h"
 
-/* DBus Prototypes */
-static gboolean _dbusmenu_server_get_layout (DbusmenuServer * server, gint parent, guint * revision, gchar ** layout, GError ** error);
-static gboolean _dbusmenu_server_get_property (DbusmenuServer * server, gint id, gchar * property, gchar ** value, GError ** error);
-static gboolean _dbusmenu_server_get_properties (DbusmenuServer * server, gint id, gchar ** properties, GHashTable ** dict, GError ** error);
-static gboolean _dbusmenu_server_get_group_properties (DbusmenuServer * server, GArray * ids, gchar ** properties, GPtrArray ** values, GError ** error);
-static gboolean _dbusmenu_server_event (DbusmenuServer * server, gint id, gchar * eventid, GValue * data, guint timestamp, GError ** error);
-static gboolean _dbusmenu_server_get_children (DbusmenuServer * server, gint id, GPtrArray * properties, GPtrArray ** output, GError ** error);
-static gboolean _dbusmenu_server_about_to_show (DbusmenuServer * server, gint id, gboolean * need_update, GError ** error);
-/* DBus Helpers */
-static void _gvalue_array_append_int(GValueArray *array, gint i);
-static void _gvalue_array_append_hashtable(GValueArray *array, GHashTable * dict);
-
-#include "dbusmenu-server.h"
+#include "dbus-menu-clean.xml.h"
 
 static void layout_update_signal (DbusmenuServer * server);
 
-#define DBUSMENU_VERSION_NUMBER  2
+#define DBUSMENU_VERSION_NUMBER    2
+#define DBUSMENU_INTERFACE         "org.ayatana.dbusmenu"
 
 /* Privates, I'll show you mine... */
 struct _DbusmenuServerPrivate
@@ -59,6 +50,10 @@
 	gchar * dbusobject;
 	gint layout_revision;
 	guint layout_idle;
+
+	GDBusConnection * bus;
+	GCancellable * bus_lookup;
+	guint dbus_registration;
 };
 
 #define DBUSMENU_SERVER_GET_PRIVATE(o) (DBUSMENU_SERVER(o)->priv)
@@ -88,22 +83,110 @@
 	INVALID_PROPERTY_NAME,
 	UNKNOWN_DBUS_ERROR,
 	NOT_IMPLEMENTED,
+	NO_VALID_LAYOUT,
 	LAST_ERROR
 };
 
+/* Method Table */
+typedef void (*MethodTableFunc) (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation);
+
+typedef struct _method_table_t method_table_t;
+struct _method_table_t {
+	const gchar * interned_name;
+	MethodTableFunc func;
+};
+
+enum {
+	METHOD_GET_LAYOUT = 0,
+	METHOD_GET_GROUP_PROPERTIES,
+	METHOD_GET_CHILDREN,
+	METHOD_GET_PROPERTY,
+	METHOD_GET_PROPERTIES,
+	METHOD_EVENT,
+	METHOD_ABOUT_TO_SHOW,
+	/* Counter, do not remove! */
+	METHOD_COUNT
+};
+
 /* Prototype */
-static void dbusmenu_server_class_init (DbusmenuServerClass *class);
-static void dbusmenu_server_init       (DbusmenuServer *self);
-static void dbusmenu_server_dispose    (GObject *object);
-static void dbusmenu_server_finalize   (GObject *object);
-static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec);
-static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
-static void menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, GValue * value, DbusmenuServer * server);
-static void menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint pos, DbusmenuServer * server);
-static void menuitem_child_removed (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, DbusmenuServer * server);
-static void menuitem_signals_create (DbusmenuMenuitem * mi, gpointer data);
-static void menuitem_signals_remove (DbusmenuMenuitem * mi, gpointer data);
-static GQuark error_quark (void);
+static void       dbusmenu_server_class_init  (DbusmenuServerClass *class);
+static void       dbusmenu_server_init        (DbusmenuServer *self);
+static void       dbusmenu_server_dispose     (GObject *object);
+static void       dbusmenu_server_finalize    (GObject *object);
+static void       set_property                (GObject * obj,
+                                               guint id,
+                                               const GValue * value,
+                                               GParamSpec * pspec);
+static void       get_property                (GObject * obj,
+                                               guint id,
+                                               GValue * value,
+                                               GParamSpec * pspec);
+static void       register_object             (DbusmenuServer * server);
+static void       bus_got_cb                  (GObject * obj,
+                                               GAsyncResult * result,
+                                               gpointer user_data);
+static void       bus_method_call             (GDBusConnection * connection,
+                                               const gchar * sender,
+                                               const gchar * path,
+                                               const gchar * interface,
+                                               const gchar * method,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation,
+                                               gpointer user_data);
+static GVariant * bus_get_prop                (GDBusConnection * connection,
+                                               const gchar * sender,
+                                               const gchar * path,
+                                               const gchar * interface,
+                                               const gchar * property,
+                                               GError ** error,
+                                               gpointer user_data);
+static void       menuitem_property_changed   (DbusmenuMenuitem * mi,
+                                               gchar * property,
+                                               GVariant * variant,
+                                               DbusmenuServer * server);
+static void       menuitem_child_added        (DbusmenuMenuitem * parent,
+                                               DbusmenuMenuitem * child,
+                                               guint pos,
+                                               DbusmenuServer * server);
+static void       menuitem_child_removed      (DbusmenuMenuitem * parent,
+                                               DbusmenuMenuitem * child,
+                                               DbusmenuServer * server);
+static void       menuitem_signals_create     (DbusmenuMenuitem * mi,
+                                               gpointer data);
+static void       menuitem_signals_remove     (DbusmenuMenuitem * mi,
+                                               gpointer data);
+static GQuark     error_quark                 (void);
+static void       bus_get_layout              (DbusmenuServer * server,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation);
+static void       bus_get_group_properties    (DbusmenuServer * server,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation);
+static void       bus_get_children            (DbusmenuServer * server,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation);
+static void       bus_get_property            (DbusmenuServer * server,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation);
+static void       bus_get_properties          (DbusmenuServer * server,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation);
+static void       bus_event                   (DbusmenuServer * server,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation);
+static void       bus_about_to_show           (DbusmenuServer * server,
+                                               GVariant * params,
+                                               GDBusMethodInvocation * invocation);
+
+/* Globals */
+static GDBusNodeInfo *            dbusmenu_node_info = NULL;
+static GDBusInterfaceInfo *       dbusmenu_interface_info = NULL;
+static const GDBusInterfaceVTable dbusmenu_interface_table = {
+	method_call:    bus_method_call,
+	get_property:   bus_get_prop,
+	set_property:   NULL /* No properties that can be set */
+};
+static method_table_t             dbusmenu_method_table[METHOD_COUNT];
 
 G_DEFINE_TYPE (DbusmenuServer, dbusmenu_server, G_TYPE_OBJECT);
 
@@ -134,8 +217,8 @@
 	                                         G_SIGNAL_RUN_LAST,
 	                                         G_STRUCT_OFFSET(DbusmenuServerClass, id_prop_update),
 	                                         NULL, NULL,
-	                                         _dbusmenu_server_marshal_VOID__INT_STRING_POINTER,
-	                                         G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_VALUE);
+	                                         _dbusmenu_server_marshal_VOID__INT_STRING_VARIANT,
+	                                         G_TYPE_NONE, 3, G_TYPE_INT, G_TYPE_STRING, G_TYPE_VARIANT);
 	/**
 		DbusmenuServer::id-update:
 		@arg0: The #DbusmenuServer emitting the signal.
@@ -203,7 +286,45 @@
 	                                              DBUSMENU_VERSION_NUMBER, DBUSMENU_VERSION_NUMBER, DBUSMENU_VERSION_NUMBER,
 	                                              G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
-	dbus_g_object_type_install_info(DBUSMENU_TYPE_SERVER, &dbus_glib__dbusmenu_server_object_info);
+	if (dbusmenu_node_info == NULL) {
+		GError * error = NULL;
+
+		dbusmenu_node_info = g_dbus_node_info_new_for_xml(dbus_menu_clean_xml, &error);
+		if (error != NULL) {
+			g_error("Unable to parse DBusmenu Interface description: %s", error->message);
+			g_error_free(error);
+		}
+	}
+
+	if (dbusmenu_interface_info == NULL) {
+		dbusmenu_interface_info = g_dbus_node_info_lookup_interface(dbusmenu_node_info, DBUSMENU_INTERFACE);
+
+		if (dbusmenu_interface_info == NULL) {
+			g_error("Unable to find interface '" DBUSMENU_INTERFACE "'");
+		}
+	}
+
+	/* Building our Method table :( */
+	dbusmenu_method_table[METHOD_GET_LAYOUT].interned_name = g_intern_static_string("GetLayout");
+	dbusmenu_method_table[METHOD_GET_LAYOUT].func          = bus_get_layout;
+
+	dbusmenu_method_table[METHOD_GET_GROUP_PROPERTIES].interned_name = g_intern_static_string("GetGroupProperties");
+	dbusmenu_method_table[METHOD_GET_GROUP_PROPERTIES].func          = bus_get_group_properties;
+
+	dbusmenu_method_table[METHOD_GET_CHILDREN].interned_name = g_intern_static_string("GetChildren");
+	dbusmenu_method_table[METHOD_GET_CHILDREN].func          = bus_get_children;
+
+	dbusmenu_method_table[METHOD_GET_PROPERTY].interned_name = g_intern_static_string("GetProperty");
+	dbusmenu_method_table[METHOD_GET_PROPERTY].func          = bus_get_property;
+
+	dbusmenu_method_table[METHOD_GET_PROPERTIES].interned_name = g_intern_static_string("GetProperties");
+	dbusmenu_method_table[METHOD_GET_PROPERTIES].func          = bus_get_properties;
+
+	dbusmenu_method_table[METHOD_EVENT].interned_name = g_intern_static_string("Event");
+	dbusmenu_method_table[METHOD_EVENT].func          = bus_event;
+
+	dbusmenu_method_table[METHOD_ABOUT_TO_SHOW].interned_name = g_intern_static_string("AboutToShow");
+	dbusmenu_method_table[METHOD_ABOUT_TO_SHOW].func          = bus_about_to_show;
 
 	return;
 }
@@ -219,6 +340,9 @@
 	priv->dbusobject = NULL;
 	priv->layout_revision = 1;
 	priv->layout_idle = 0;
+	priv->bus = NULL;
+	priv->bus_lookup = NULL;
+	priv->dbus_registration = 0;
 
 	return;
 }
@@ -237,6 +361,27 @@
 		g_object_unref(priv->root);
 	}
 
+	if (priv->dbus_registration != 0) {
+		g_dbus_connection_unregister_object(priv->bus, priv->dbus_registration);
+		priv->dbus_registration = 0;
+	}
+
+	if (priv->bus != NULL) {
+		g_object_unref(priv->bus);
+		priv->bus = NULL;
+	}
+
+	if (priv->bus_lookup != NULL) {
+		if (!g_cancellable_is_cancelled(priv->bus_lookup)) {
+			/* Note, this may case the async function to run at
+			   some point in the future.  That's okay, it'll get an
+			   error, but just FYI */
+			g_cancellable_cancel(priv->bus_lookup);
+		}
+		g_object_unref(priv->bus_lookup);
+		priv->bus_lookup = NULL;
+	}
+
 	G_OBJECT_CLASS (dbusmenu_server_parent_class)->dispose (object);
 	return;
 }
@@ -252,21 +397,21 @@
 set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(obj);
-	GError * error = NULL;
 
 	switch (id) {
 	case PROP_DBUS_OBJECT:
 		g_return_if_fail(priv->dbusobject == NULL);
 		priv->dbusobject = g_value_dup_string(value);
-		DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-
-		if (connection == NULL || error != NULL) {
-			g_warning("Unable to get session bus: %s", error == NULL ? "No message" : error->message);
-			if (error != NULL) { g_error_free(error); }
+
+		if (priv->bus == NULL) {
+			if (priv->bus_lookup == NULL) {
+				priv->bus_lookup = g_cancellable_new();
+				g_return_if_fail(priv->bus_lookup != NULL);
+			}
+
+			g_bus_get(G_BUS_TYPE_SESSION, priv->bus_lookup, bus_got_cb, obj);
 		} else {
-			dbus_g_connection_register_g_object(connection,
-			                                    priv->dbusobject,
-			                                    obj);
+			register_object(DBUSMENU_SERVER(obj));
 		}
 		break;
 	case PROP_ROOT_NODE:
@@ -328,6 +473,115 @@
 	return;
 }
 
+/* Register the object on the dbus bus */
+static void
+register_object (DbusmenuServer * server)
+{
+	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+
+	/* Object info */
+	g_return_if_fail(priv->bus != NULL);
+	g_return_if_fail(priv->dbusobject != NULL);
+
+	/* Class info */
+	g_return_if_fail(dbusmenu_node_info != NULL);
+	g_return_if_fail(dbusmenu_interface_info != NULL);
+
+	/* We might block on this in the future, but it'd be nice if
+	   we could change the object path.  Thinking about it... */
+	if (priv->dbus_registration != 0) {
+		g_dbus_connection_unregister_object(priv->bus, priv->dbus_registration);
+		priv->dbus_registration = 0;
+	}
+
+	GError * error = NULL;
+	priv->dbus_registration = g_dbus_connection_register_object(priv->bus,
+	                                                            priv->dbusobject,
+	                                                            dbusmenu_interface_info,
+	                                                            &dbusmenu_interface_table,
+	                                                            server,
+	                                                            NULL,
+	                                                            &error);
+
+	if (error != NULL) {
+		g_warning("Unable to register object on bus: %s", error->message);
+		g_error_free(error);
+	}
+
+	return;
+}
+
+/* Callback from asking GIO to get us the session bus */
+static void
+bus_got_cb (GObject * obj, GAsyncResult * result, gpointer user_data)
+{
+	GError * error = NULL;
+
+	GDBusConnection * bus = g_bus_get_finish(result, &error);
+
+	if (error != NULL) {
+		g_warning("Unable to get session bus: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	/* Note: We're not using the user_data before we check for
+	   the error so that in the cancelled case at destruction of
+	   the object we don't end up with an invalid object. */
+
+	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(user_data);
+	priv->bus = bus;
+
+	register_object(DBUSMENU_SERVER(user_data));
+
+	return;
+}
+
+/* Function for the GDBus vtable to handle all method calls and dish
+   them out the appropriate functions */
+static void
+bus_method_call (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * method, GVariant * params, GDBusMethodInvocation * invocation, gpointer user_data)
+{
+	int i;
+	const gchar * interned_method = g_intern_string(method);
+
+	for (i = 0; i < METHOD_COUNT; i++) {
+		if (dbusmenu_method_table[i].interned_name == interned_method) {
+			if (dbusmenu_method_table[i].func != NULL) {
+				return dbusmenu_method_table[i].func(DBUSMENU_SERVER(user_data), params, invocation);
+			} else {
+				/* If we have a null function we're responding but nothing else. */
+				g_warning("Invalid function call for '%s' with parameters: %s", method, g_variant_print(params, TRUE));
+				g_dbus_method_invocation_return_value(invocation, NULL);
+				return;
+			}
+		}
+	}
+
+	/* We're here because there's an error */
+	g_dbus_method_invocation_return_error(invocation,
+	                                      error_quark(),
+	                                      NOT_IMPLEMENTED,
+	                                      "Unable to find method '%s'",
+	                                      method);
+	return;
+}
+
+/* For the GDBus vtable but we only have one property so it's pretty
+   simple. */
+static GVariant *
+bus_get_prop (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * property, GError ** error, gpointer user_data)
+{
+	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(user_data);
+
+	/* None of these should happen */
+	g_return_val_if_fail(g_strcmp0(interface, DBUSMENU_INTERFACE) == 0, NULL);
+	g_return_val_if_fail(g_strcmp0(path, priv->dbusobject) == 0, NULL);
+	g_return_val_if_fail(g_strcmp0(property, "version") == 0, NULL);
+
+	return g_variant_new_uint32(DBUSMENU_VERSION_NUMBER);
+}
+
 /* Handle actually signalling in the idle loop.  This way we collect all
    the updates. */
 static gboolean
@@ -337,6 +591,15 @@
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
 
 	g_signal_emit(G_OBJECT(server), signals[LAYOUT_UPDATED], 0, priv->layout_revision, 0, TRUE);
+	if (priv->dbusobject != NULL && priv->bus != NULL) {
+		g_dbus_connection_emit_signal(priv->bus,
+		                              NULL,
+		                              priv->dbusobject,
+		                              DBUSMENU_INTERFACE,
+		                              "LayoutUpdated",
+		                              g_variant_new("(ui)", priv->layout_revision, 0),
+		                              NULL);
+	}
 
 	priv->layout_idle = 0;
 
@@ -358,9 +621,21 @@
 }
 
 static void 
-menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, GValue * value, DbusmenuServer * server)
+menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, GVariant * variant, DbusmenuServer * server)
 {
-	g_signal_emit(G_OBJECT(server), signals[ID_PROP_UPDATE], 0, dbusmenu_menuitem_get_id(mi), property, value, TRUE);
+	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+
+	g_signal_emit(G_OBJECT(server), signals[ID_PROP_UPDATE], 0, dbusmenu_menuitem_get_id(mi), property, variant, TRUE);
+
+	if (priv->dbusobject != NULL && priv->bus != NULL) {
+		g_dbus_connection_emit_signal(priv->bus,
+		                              NULL,
+		                              priv->dbusobject,
+		                              DBUSMENU_INTERFACE,
+		                              "ItemPropertyUpdated",
+		                              g_variant_new("(isv)", dbusmenu_menuitem_get_id(mi), property, variant),
+		                              NULL);
+	}
 	return;
 }
 
@@ -411,7 +686,20 @@
 static void 
 menuitem_shown (DbusmenuMenuitem * mi, guint timestamp, DbusmenuServer * server)
 {
+	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+
 	g_signal_emit(G_OBJECT(server), signals[ITEM_ACTIVATION], 0, dbusmenu_menuitem_get_id(mi), timestamp, TRUE);
+
+	if (priv->dbusobject != NULL && priv->bus != NULL) {
+		g_dbus_connection_emit_signal(priv->bus,
+		                              NULL,
+		                              priv->dbusobject,
+		                              DBUSMENU_INTERFACE,
+		                              "ItemActivationRequested",
+		                              g_variant_new("(iu)", dbusmenu_menuitem_get_id(mi), timestamp),
+		                              NULL);
+	}
+
 	return;
 }
 
@@ -451,12 +739,15 @@
 }
 
 /* DBus interface */
-static gboolean
-_dbusmenu_server_get_layout (DbusmenuServer * server, gint parent, guint * revision, gchar ** layout, GError ** error)
+static void
+bus_get_layout (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
 
-	*revision = priv->layout_revision;
+	gint parent = 0;
+	g_variant_get(params, "(i)", &parent);
+
+	guint revision = priv->layout_revision;
 	GPtrArray * xmlarray = g_ptr_array_new();
 
 	if (parent == 0) {
@@ -467,199 +758,234 @@
 			dbusmenu_menuitem_buildxml(priv->root, xmlarray);
 		}
 	} else {
-		DbusmenuMenuitem * item = dbusmenu_menuitem_find_id(priv->root, parent);
+		DbusmenuMenuitem * item = NULL;
+		if (priv->root != NULL) {
+			item = dbusmenu_menuitem_find_id(priv->root, parent);
+		}
+
 		if (item == NULL) {
-			if (error != NULL) {
-				g_set_error(error,
-				            error_quark(),
-				            INVALID_MENUITEM_ID,
-				            "The ID supplied %d does not refer to a menu item we have",
-				            parent);
-			}
-			return FALSE;
+			g_dbus_method_invocation_return_error(invocation,
+				                                  error_quark(),
+				                                  INVALID_MENUITEM_ID,
+				                                  "The ID supplied %d does not refer to a menu item we have",
+				                                  parent);
+			return;
 		}
 		dbusmenu_menuitem_buildxml(item, xmlarray);
 	}
 	g_ptr_array_add(xmlarray, NULL);
 
 	/* build string */
-	*layout = g_strjoinv("", (gchar **)xmlarray->pdata);
+	gchar * layout = g_strjoinv("", (gchar **)xmlarray->pdata);
 
 	g_ptr_array_foreach(xmlarray, xmlarray_foreach_free, NULL);
 	g_ptr_array_free(xmlarray, TRUE);
 
-	return TRUE;
+	g_dbus_method_invocation_return_value(invocation,
+	                                      g_variant_new("(us)",
+	                                                    revision,
+	                                                    layout));
+
+	g_free(layout);
+
+	return;
 }
 
-static gboolean 
-_dbusmenu_server_get_property (DbusmenuServer * server, gint id, gchar * property, gchar ** value, GError ** error)
+/* Get a single property off of a single menuitem */
+static void
+bus_get_property (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+
+	if (priv->root == NULL) {
+		g_dbus_method_invocation_return_error(invocation,
+			            error_quark(),
+			            NO_VALID_LAYOUT,
+			            "There currently isn't a layout in this server");
+		return;
+	}
+	
+	gint id = g_variant_get_int32(g_variant_get_child_value(params, 0));
+	const gchar * property = g_variant_get_string(g_variant_get_child_value(params, 1), NULL);
+
 	DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
 
 	if (mi == NULL) {
-		if (error != NULL) {
-			g_set_error(error,
+		g_dbus_method_invocation_return_error(invocation,
 			            error_quark(),
 			            INVALID_MENUITEM_ID,
 			            "The ID supplied %d does not refer to a menu item we have",
 			            id);
-		}
-		return FALSE;
+		return;
 	}
 
-	const gchar * prop = dbusmenu_menuitem_property_get(mi, property);
-	if (prop == NULL) {
-		if (error != NULL) {
-			g_set_error(error,
+	GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property);
+	if (variant == NULL) {
+		g_dbus_method_invocation_return_error(invocation,
 			            error_quark(),
 			            INVALID_PROPERTY_NAME,
 			            "The property '%s' does not exist on menuitem with ID of %d",
 			            property,
 			            id);
-		}
-		return FALSE;
-	}
-
-	if (value == NULL) {
-		if (error != NULL) {
-			g_set_error(error,
-			            error_quark(),
-			            UNKNOWN_DBUS_ERROR,
-			            "Uhm, yeah.  We didn't get anywhere to put the value, that's really weird.  Seems impossible really.");
-		}
-		return FALSE;
-	}
-
-	*value = g_strdup(prop);
-
-	return TRUE;
+		return;
+	}
+
+	g_dbus_method_invocation_return_value(invocation, g_variant_new("(v)", variant));
+	return;
 }
 
-static gboolean
-_dbusmenu_server_get_properties (DbusmenuServer * server, gint id, gchar ** properties, GHashTable ** dict, GError ** error)
+/* Get some properties off of a single menuitem */
+static void
+bus_get_properties (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+	
+	if (priv->root == NULL) {
+		g_dbus_method_invocation_return_error(invocation,
+			            error_quark(),
+			            NO_VALID_LAYOUT,
+			            "There currently isn't a layout in this server");
+		return;
+	}
+
+	gint id = g_variant_get_int32(g_variant_get_child_value(params, 0));
+
 	DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
 
 	if (mi == NULL) {
-		if (error != NULL) {
-			g_set_error(error,
+		g_dbus_method_invocation_return_error(invocation,
 			            error_quark(),
 			            INVALID_MENUITEM_ID,
 			            "The ID supplied %d does not refer to a menu item we have",
 			            id);
-		}
-		return FALSE;
+		return;
 	}
 
-	*dict = dbusmenu_menuitem_properties_copy(mi);
-
-	return TRUE;
+	GVariant * dict = dbusmenu_menuitem_properties_variant(mi);
+
+	g_dbus_method_invocation_return_value(invocation, g_variant_new("(a{sv})", dict));
+
+	return;
 }
 
 /* Handles getting a bunch of properties from a variety of menu items
    to make one mega dbus message */
-static gboolean
-_dbusmenu_server_get_group_properties (DbusmenuServer * server, GArray * ids, gchar ** properties, GPtrArray ** values, GError ** error)
-{
-	/* Build an initial pointer array */
-	*values = g_ptr_array_new();
-
-	/* Go through each ID to get that ID's properties */
-	int idcnt;
-	for (idcnt = 0; idcnt < ids->len; idcnt++) {
-		GHashTable * idprops = NULL;
-		GError * error = NULL;
-		gint id = g_array_index(ids, int, idcnt);
-
-		/* Get the properties for this ID the old fashioned way. */
-		if (!_dbusmenu_server_get_properties(server, id, properties, &idprops, &error)) {
-			g_warning("Error getting the properties from ID %d: %s", id, error->message);
-			g_error_free(error);
-			error = NULL;
-			continue;
-		}
-
-		GValueArray * valarray = g_value_array_new(2);
-
-		_gvalue_array_append_int(valarray, id);
-		_gvalue_array_append_hashtable(valarray, idprops);
-
-		g_ptr_array_add(*values, valarray);
-	}
-
-	return TRUE;
-}
-
-/* Allocate a value on the stack for the int and append
-   it to the array. */
-static void
-_gvalue_array_append_int(GValueArray *array, gint i)
-{
-	GValue value = {0};
-
-	g_value_init(&value, G_TYPE_INT);
-	g_value_set_int(&value, i);
-	g_value_array_append(array, &value);
-	g_value_unset(&value);
-}
-
-/* Allocate a value on the stack for the hashtable and append
-   it to the array. */
-static void
-_gvalue_array_append_hashtable(GValueArray *array, GHashTable * dict)
-{
-	GValue value = {0};
-
-	g_value_init(&value, dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE));
-	g_value_set_boxed(&value, dict);
-	g_value_array_append(array, &value);
-	g_value_unset(&value);
-}
-
+static void
+bus_get_group_properties (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
+{
+	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+
+	if (priv->root == NULL) {
+		GVariant * idlist = g_variant_get_child_value(params, 0);
+		if (g_variant_n_children(idlist) == 1 && g_variant_get_int32(g_variant_get_child_value(idlist, 0)) == 0) {
+			GVariant * final = g_variant_parse(g_variant_type_new("(a(ia{sv}))"), "([(0, {})],)", NULL, NULL, NULL);
+			g_dbus_method_invocation_return_value(invocation, final);
+			return;
+		}
+
+		g_dbus_method_invocation_return_error(invocation,
+			            error_quark(),
+			            NO_VALID_LAYOUT,
+			            "There currently isn't a layout in this server");
+		return;
+	}
+
+	GVariantIter ids;
+	g_variant_iter_init(&ids, g_variant_get_child_value(params, 0));
+
+	GVariantBuilder builder;
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+
+	gint id;
+	while (g_variant_iter_next(&ids, "i", &id)) {
+		DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
+		if (mi == NULL) continue;
+
+		GVariantBuilder wbuilder;
+		g_variant_builder_init(&wbuilder, G_VARIANT_TYPE_TUPLE);
+		g_variant_builder_add(&wbuilder, "i", id);
+		GVariant * props = dbusmenu_menuitem_properties_variant(mi);
+
+		if (props == NULL) {
+			props = g_variant_parse(g_variant_type_new("a{sv}"), "{}", NULL, NULL, NULL);
+		}
+
+		g_variant_builder_add_value(&wbuilder, props);
+		GVariant * mi_data = g_variant_builder_end(&wbuilder);
+
+		g_variant_builder_add_value(&builder, mi_data);
+	}
+
+	GVariant * ret = g_variant_builder_end(&builder);
+
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
+	g_variant_builder_add_value(&builder, ret);
+	GVariant * final = g_variant_builder_end(&builder);
+
+	g_dbus_method_invocation_return_value(invocation, final);
+
+	return;
+}
+
+/* Turn a menuitem into an variant and attach it to the
+   VariantBuilder we passed in */
 static void
 serialize_menuitem(gpointer data, gpointer user_data)
 {
 	DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data);
-	GPtrArray * output = (GPtrArray *)(user_data);
+	GVariantBuilder * builder = (GVariantBuilder *)(user_data);
 
 	gint id = dbusmenu_menuitem_get_id(mi);
-	GHashTable * dict = dbusmenu_menuitem_properties_copy(mi);
-
-	GValueArray * item = g_value_array_new(2);
-	_gvalue_array_append_int(item, id);
-	_gvalue_array_append_hashtable(item, dict);
-
-	g_ptr_array_add(output, item);
-
-	g_hash_table_unref(dict);
+	GVariant * props = dbusmenu_menuitem_properties_variant(mi);
+
+	g_variant_builder_add(builder, "ia{sv}", id, props);
 
 	return;
 }
 
-static gboolean
-_dbusmenu_server_get_children (DbusmenuServer * server, gint id, GPtrArray * properties, GPtrArray ** output, GError ** error)
+/* Gets the children and their properties of the ID that is
+   passed into the function */
+static void
+bus_get_children (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+	gint id = g_variant_get_int32(g_variant_get_child_value(params, 0));
+
+	if (priv->root == NULL) {
+		g_dbus_method_invocation_return_error(invocation,
+			            error_quark(),
+			            NO_VALID_LAYOUT,
+			            "There currently isn't a layout in this server");
+		return;
+	}
+
 	DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
 
 	if (mi == NULL) {
-		if (error != NULL) {
-			g_set_error(error,
-			            error_quark(),
-			            INVALID_MENUITEM_ID,
-			            "The ID supplied %d does not refer to a menu item we have",
-			            id);
-		}
-		return FALSE;
+		g_dbus_method_invocation_return_error(invocation,
+			                                  error_quark(),
+			                                  INVALID_MENUITEM_ID,
+			                                  "The ID supplied %d does not refer to a menu item we have",
+			                                  id);
+		return;
 	}
 
-	*output = g_ptr_array_new();
 	GList * children = dbusmenu_menuitem_get_children(mi);
-	g_list_foreach(children, serialize_menuitem, *output);
-
-	return TRUE;
+	GVariant * ret = NULL;
+
+	if (children != NULL) {
+		GVariantBuilder builder;
+		g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY); 
+
+		g_list_foreach(children, serialize_menuitem, &builder);
+
+		ret = g_variant_new("(a(ia{svg}))", g_variant_builder_end(&builder));
+	} else {
+		ret = g_variant_parse(g_variant_type_new("(a(ia{sv}))"), "([(0, {})],)", NULL, NULL, NULL);
+	}
+
+	g_dbus_method_invocation_return_value(invocation, ret);
+	return;
 }
 
 /* Structure for holding the event data for the idle function
@@ -668,7 +994,7 @@
 struct _idle_event_t {
 	DbusmenuMenuitem * mi;
 	gchar * eventid;
-	GValue data;
+	GVariant * variant;
 	guint timestamp;
 };
 
@@ -679,66 +1005,84 @@
 {
 	idle_event_t * data = (idle_event_t *)user_data;
 
-	dbusmenu_menuitem_handle_event(data->mi, data->eventid, &data->data, data->timestamp);
+	dbusmenu_menuitem_handle_event(data->mi, data->eventid, data->variant, data->timestamp);
 
 	g_object_unref(data->mi);
 	g_free(data->eventid);
-	g_value_unset(&data->data);
+	g_variant_unref(data->variant);
 	g_free(data);
 	return FALSE;
 }
 
-/* Handles the even coming off of DBus */
-static gboolean
-_dbusmenu_server_event (DbusmenuServer * server, gint id, gchar * eventid, GValue * data, guint timestamp, GError ** error)
+/* Handles the events coming off of DBus */
+static void
+bus_event (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+
+	if (priv->root == NULL) {
+		g_dbus_method_invocation_return_error(invocation,
+			            error_quark(),
+			            NO_VALID_LAYOUT,
+			            "There currently isn't a layout in this server");
+		return;
+	}
+
+	gint id = g_variant_get_int32(g_variant_get_child_value(params, 0));
 	DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
 
 	if (mi == NULL) {
-		if (error != NULL) {
-			g_set_error(error,
-			            error_quark(),
-			            INVALID_MENUITEM_ID,
-			            "The ID supplied %d does not refer to a menu item we have",
-			            id);
-		}
-		return FALSE;
+		g_dbus_method_invocation_return_error(invocation,
+			                                  error_quark(),
+			                                  INVALID_MENUITEM_ID,
+			                                  "The ID supplied %d does not refer to a menu item we have",
+			                                  id);
+		return;
 	}
 
 	idle_event_t * event_data = g_new0(idle_event_t, 1);
 	event_data->mi = mi;
 	g_object_ref(event_data->mi);
-	event_data->eventid = g_strdup(eventid);
-	event_data->timestamp = timestamp;
-	g_value_init(&(event_data->data), G_VALUE_TYPE(data));
-	g_value_copy(data, &(event_data->data));
+	event_data->eventid = g_strdup(g_variant_get_string(g_variant_get_child_value(params, 1), NULL));
+	event_data->timestamp = g_variant_get_uint32(g_variant_get_child_value(params, 3));
+	event_data->variant = g_variant_get_child_value(params, 2);
 
 	g_timeout_add(0, event_local_handler, event_data);
-	return TRUE;
+
+	g_dbus_method_invocation_return_value(invocation, NULL);
+	return;
 }
 
 /* Recieve the About To Show function.  Pass it to our menu item. */
-static gboolean
-_dbusmenu_server_about_to_show (DbusmenuServer * server, gint id, gboolean * need_update, GError ** error)
+static void
+bus_about_to_show (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation)
 {
 	DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(server);
+
+	if (priv->root == NULL) {
+		g_dbus_method_invocation_return_error(invocation,
+			            error_quark(),
+			            NO_VALID_LAYOUT,
+			            "There currently isn't a layout in this server");
+		return;
+	}
+
+	gint id = g_variant_get_int32(g_variant_get_child_value(params, 0));
 	DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
 
 	if (mi == NULL) {
-		if (error != NULL) {
-			g_set_error(error,
-			            error_quark(),
-			            INVALID_MENUITEM_ID,
-			            "The ID supplied %d does not refer to a menu item we have",
-			            id);
-		}
-		return FALSE;
+		g_dbus_method_invocation_return_error(invocation,
+			                                  error_quark(),
+			                                  INVALID_MENUITEM_ID,
+			                                  "The ID supplied %d does not refer to a menu item we have",
+			                                  id);
+		return;
 	}
 
 	/* GTK+ does not support about-to-show concept for now */
-	*need_update = FALSE;
-	return TRUE;
+	g_dbus_method_invocation_return_value(invocation,
+	                                      g_variant_new("(b)", FALSE));
+	return;
 }
 
 /* Public Interface */

=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am	2010-12-06 16:50:24 +0000
+++ libdbusmenu-gtk/Makefile.am	2010-12-08 03:19:55 +0000
@@ -14,10 +14,10 @@
 endif
 
 EXTRA_DIST = \
-	dbusmenu-gtk.pc.in \
-	dbusmenu-gtk3.pc.in
+	dbusmenu-gtk-0.4.pc.in \
+	dbusmenu-gtk3-0.4.pc.in
 
-libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.1/libdbusmenu-gtk$(VER)/
+libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/
 
 libdbusmenu_gtkinclude_HEADERS = \
 	client.h \
@@ -57,7 +57,7 @@
 libdbusmenu_gtk3_la_CFLAGS = $(libdbusmenu_gtk_la_CFLAGS)
 libdbusmenu_gtk3_la_LIBADD = $(libdbusmenu_gtk_la_LIBADD)
 
-pkgconfig_DATA = dbusmenu-gtk$(VER).pc
+pkgconfig_DATA = dbusmenu-gtk$(VER)-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 #########################
@@ -85,28 +85,28 @@
 
 introspection_sources = $(libdbusmenu_gtkinclude_HEADERS)
 
-DbusmenuGtk$(VER)-0.2.gir: libdbusmenu-gtk$(VER).la
-DbusmenuGtk_0_2_gir_INCLUDES = \
+DbusmenuGtk$(VER)-0.4.gir: libdbusmenu-gtk$(VER).la
+DbusmenuGtk_0_4_gir_INCLUDES = \
 	GObject-2.0 \
 	$(GTKGIR) \
-	Dbusmenu-Glib-0.2 
-DbusmenuGtk_0_2_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
-DbusmenuGtk_0_2_gir_LIBS = libdbusmenu-gtk$(VER).la
-DbusmenuGtk_0_2_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
-DbusmenuGtk_0_2_gir_NAMESPACE = DbusmenuGtk$(VER)
-DbusmenuGtk_0_2_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
-DbusmenuGtk_0_2_gir_PACKAGES = dbusmenu-gtk$(VER)
+	Dbusmenu-Glib-0.4 
+DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
+DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
+DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+DbusmenuGtk_0_4_gir_NAMESPACE = DbusmenuGtk$(VER)
+DbusmenuGtk_0_4_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS)
+DbusmenuGtk_0_4_gir_PACKAGES = dbusmenu-gtk$(VER)
 
 # We duplicate these for the same reason as libdbusmenu_gtk3includedir above
-DbusmenuGtk3_0_2_gir_INCLUDES = $(DbusmenuGtk_0_2_gir_INCLUDES)
-DbusmenuGtk3_0_2_gir_CFLAGS = $(DbusmenuGtk_0_2_gir_CFLAGS)
-DbusmenuGtk3_0_2_gir_LIBS = $(DbusmenuGtk_0_2_gir_LIBS)
-DbusmenuGtk3_0_2_gir_FILES = $(DbusmenuGtk_0_2_gir_FILES)
-DbusmenuGtk3_0_2_gir_NAMESPACE = $(DbusmenuGtk_0_2_gir_NAMESPACE)
-DbusmenuGtk3_0_2_gir_SCANNERFLAGS = $(DbusmenuGtk_0_2_gir_SCANNERFLAGS)
-DbusmenuGtk3_0_2_gir_PACKAGES = $(DbusmenuGtk_0_2_gir_PACKAGES)
+DbusmenuGtk3_0_4_gir_INCLUDES = $(DbusmenuGtk_0_4_gir_INCLUDES)
+DbusmenuGtk3_0_4_gir_CFLAGS = $(DbusmenuGtk_0_4_gir_CFLAGS)
+DbusmenuGtk3_0_4_gir_LIBS = $(DbusmenuGtk_0_4_gir_LIBS)
+DbusmenuGtk3_0_4_gir_FILES = $(DbusmenuGtk_0_4_gir_FILES)
+DbusmenuGtk3_0_4_gir_NAMESPACE = $(DbusmenuGtk_0_4_gir_NAMESPACE)
+DbusmenuGtk3_0_4_gir_SCANNERFLAGS = $(DbusmenuGtk_0_4_gir_SCANNERFLAGS)
+DbusmenuGtk3_0_4_gir_PACKAGES = $(DbusmenuGtk_0_4_gir_PACKAGES)
 
-INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.2.gir
+INTROSPECTION_GIRS += DbusmenuGtk$(VER)-0.4.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -125,24 +125,24 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = DbusmenuGtk$(VER)-0.2.vapi
+vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
 
-DbusmenuGtk$(VER)-0.2.vapi: DbusmenuGtk$(VER)-0.2.tmp.gir Makefile.am
-	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.2 \
+DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
 		--pkg gdk-pixbuf-2.0 \
 		--pkg $(GTKVALA) \
 		--pkg atk \
-		--pkg Dbusmenu-Glib-0.2 \
+		--pkg Dbusmenu-Glib-0.4 \
 		--vapidir=$(top_builddir)/libdbusmenu-glib \
 		$<
 
-DbusmenuGtk$(VER)-0.2.tmp.gir: DbusmenuGtk$(VER)-0.2.gir
+DbusmenuGtk$(VER)-0.4.tmp.gir: DbusmenuGtk$(VER)-0.4.gir
 	$(SED) \
 		-e "s|GdkPixbuf.Pixbuf|Gdk.Pixbuf|g" \
 		-e "s|Atk.ImplementorIface|Atk.Implementor|g" \
 		$< > $@
 
-CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.2.tmp.gir
+CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
 
 endif
 

=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2010-11-11 14:15:20 +0000
+++ libdbusmenu-gtk/client.c	2010-12-08 03:19:55 +0000
@@ -57,9 +57,9 @@
 static gboolean new_item_normal     (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
 static gboolean new_item_seperator  (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
 
-static void process_visible (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * value);
-static void process_sensitive (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * value);
-static void image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GValue * invalue, gpointer userdata);
+static void process_visible (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * value);
+static void process_sensitive (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * value);
+static void image_property_handle (DbusmenuMenuitem * item, const gchar * property, GVariant * invalue, gpointer userdata);
 
 /* GObject Stuff */
 G_DEFINE_TYPE (DbusmenuGtkClient, dbusmenu_gtkclient, DBUSMENU_TYPE_CLIENT);
@@ -283,10 +283,8 @@
 menu_pressed_cb (GtkMenuItem * gmi, DbusmenuMenuitem * mi)
 {
 	if (gtk_menu_item_get_submenu(gmi) == NULL) {
-		GValue value = {0};
-		g_value_init(&value, G_TYPE_INT);
-		g_value_set_int(&value, 0);
-		dbusmenu_menuitem_handle_event(mi, "clicked", &value, gtk_get_current_event_time());
+		GVariant * variant = g_variant_new("i", 0);
+		dbusmenu_menuitem_handle_event(mi, "clicked", variant, gtk_get_current_event_time());
 	} else {
 		/* TODO: We need to stop the display of the submenu
 		         until this callback returns. */
@@ -297,7 +295,7 @@
 
 /* Process the visible property */
 static void
-process_visible (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * value)
+process_visible (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * value)
 {
 	gboolean val = TRUE;
 	if (value != NULL) {
@@ -314,7 +312,7 @@
 
 /* Process the sensitive property */
 static void
-process_sensitive (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * value)
+process_sensitive (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * value)
 {
 	gboolean val = TRUE;
 	if (value != NULL) {
@@ -326,26 +324,21 @@
 
 /* Process the sensitive property */
 static void
-process_toggle_type (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * value)
+process_toggle_type (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * variant)
 {
 	if (!IS_GENERICMENUITEM(gmi)) return;
-	if (value == NULL) return;
+	if (variant == NULL) return;
 
 	GenericmenuitemCheckType type = GENERICMENUITEM_CHECK_TYPE_NONE;
 
-	GValue strvalue = {0};
-	g_value_init(&strvalue, G_TYPE_STRING);
-
-	if (value != NULL && g_value_transform(value, &strvalue)) {
-		const gchar * strval = g_value_get_string(&strvalue);
+	if (variant != NULL) {
+		const gchar * strval = g_variant_get_string(variant, NULL);
 
 		if (!g_strcmp0(strval, DBUSMENU_MENUITEM_TOGGLE_CHECK)) {
 			type = GENERICMENUITEM_CHECK_TYPE_CHECKBOX;
 		} else if (!g_strcmp0(strval, DBUSMENU_MENUITEM_TOGGLE_RADIO)) {
 			type = GENERICMENUITEM_CHECK_TYPE_RADIO;
 		}
-
-		g_value_unset(&strvalue);
 	}
 
 	genericmenuitem_set_check_type(GENERICMENUITEM(gmi), type);
@@ -355,17 +348,14 @@
 
 /* Process the sensitive property */
 static void
-process_toggle_state (DbusmenuMenuitem * mi, GtkMenuItem * gmi, const GValue * value)
+process_toggle_state (DbusmenuMenuitem * mi, GtkMenuItem * gmi, GVariant * variant)
 {
 	if (!IS_GENERICMENUITEM(gmi)) return;
 
 	GenericmenuitemState state = GENERICMENUITEM_STATE_UNCHECKED;
 
-	GValue intvalue = {0};
-	g_value_init(&intvalue, G_TYPE_INT);
-
-	if (value != NULL && g_value_transform(value, &intvalue)) {
-		int val = g_value_get_int(&intvalue);
+	if (variant != NULL) {
+		int val = g_variant_get_int32(variant);
 
 		if (val == DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED) {
 			state = GENERICMENUITEM_STATE_CHECKED;
@@ -381,18 +371,18 @@
 /* Whenever we have a property change on a DbusmenuMenuitem
    we need to be responsive to that. */
 static void
-menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, GtkMenuItem * gmi)
+menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * variant, GtkMenuItem * gmi)
 {
 	if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_LABEL)) {
-		gtk_menu_item_set_label(gmi, g_value_get_string(value));
+		gtk_menu_item_set_label(gmi, variant == NULL ? NULL : g_variant_get_string(variant, NULL));
 	} else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_VISIBLE)) {
-		process_visible(mi, gmi, value);
+		process_visible(mi, gmi, variant);
 	} else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_ENABLED)) {
-		process_sensitive(mi, gmi, value);
+		process_sensitive(mi, gmi, variant);
 	} else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE)) {
-		process_toggle_type(mi, gmi, value);
+		process_toggle_type(mi, gmi, variant);
 	} else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE)) {
-		process_toggle_state(mi, gmi, value);
+		process_toggle_state(mi, gmi, variant);
 	}
 
 	return;
@@ -401,7 +391,7 @@
 /* Special handler for the shortcut changing as we need to have the
    client for that one to get the accel group. */
 static void
-menu_shortcut_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, DbusmenuGtkClient * client)
+menu_shortcut_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, DbusmenuGtkClient * client)
 {
 	if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_SHORTCUT)) {
 		refresh_shortcut(client, mi);
@@ -543,10 +533,10 @@
 	g_object_weak_ref(G_OBJECT(item), destoryed_dbusmenuitem_cb, gmi);
 
 	/* Check our set of props to see if any are set already */
-	process_visible(item, gmi, dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_VISIBLE));
-	process_sensitive(item, gmi, dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_ENABLED));
-	process_toggle_type(item, gmi, dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE));
-	process_toggle_state(item, gmi, dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE));
+	process_visible(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_VISIBLE));
+	process_sensitive(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ENABLED));
+	process_toggle_type(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE));
+	process_toggle_state(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE));
 	refresh_shortcut(client, item);
 
 	/* Oh, we're a child, let's deal with that */
@@ -711,11 +701,11 @@
 
 	image_property_handle(newitem,
 	                      DBUSMENU_MENUITEM_PROP_ICON_NAME,
-	                      dbusmenu_menuitem_property_get_value(newitem, DBUSMENU_MENUITEM_PROP_ICON_NAME),
+	                      dbusmenu_menuitem_property_get_variant(newitem, DBUSMENU_MENUITEM_PROP_ICON_NAME),
 	                      client);
 	image_property_handle(newitem,
 	                      DBUSMENU_MENUITEM_PROP_ICON_DATA,
-	                      dbusmenu_menuitem_property_get_value(newitem, DBUSMENU_MENUITEM_PROP_ICON_DATA),
+	                      dbusmenu_menuitem_property_get_variant(newitem, DBUSMENU_MENUITEM_PROP_ICON_DATA),
 	                      client);
 	g_signal_connect(G_OBJECT(newitem),
 	                 DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED,
@@ -749,7 +739,7 @@
 /* This handler looks at property changes for items that are
    image menu items. */
 static void
-image_property_handle (DbusmenuMenuitem * item, const gchar * property, const GValue * invalue, gpointer userdata)
+image_property_handle (DbusmenuMenuitem * item, const gchar * property, GVariant * variant, gpointer userdata)
 {
 	/* We're only looking at these two properties here */
 	if (g_strcmp0(property, DBUSMENU_MENUITEM_PROP_ICON_NAME) != 0 &&
@@ -758,11 +748,10 @@
 	}
 
 	const gchar * value = NULL;
+	if (variant != NULL) {
+		value = g_variant_get_string(variant, NULL);
+	}
 	
-	if (invalue != NULL && G_VALUE_TYPE(invalue) == G_TYPE_STRING) {
-		value = g_value_get_string(invalue);
-	}
-
 	if (value == NULL || value[0] == '\0') {
 		/* This means that we're unsetting a value. */
 		/* Try to use the other one */

=== renamed file 'libdbusmenu-gtk/dbusmenu-gtk.pc.in' => 'libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in'
--- libdbusmenu-gtk/dbusmenu-gtk.pc.in	2009-03-25 20:09:14 +0000
+++ libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in	2010-12-08 03:19:55 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.1
+Cflags: -I${includedir}/libdbusmenu-0.4
 Requires: dbus-glib-1 dbusmenu-glib
 Libs: -L${libdir} -ldbusmenu-gtk
 

=== renamed file 'libdbusmenu-gtk/dbusmenu-gtk3.pc.in' => 'libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in'
--- libdbusmenu-gtk/dbusmenu-gtk3.pc.in	2010-10-06 14:13:09 +0000
+++ libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in	2010-12-08 03:19:55 +0000
@@ -4,7 +4,7 @@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libdbusmenu-0.1
+Cflags: -I${includedir}/libdbusmenu-0.4
 Requires: dbus-glib-1 dbusmenu-glib
 Libs: -L${libdir} -ldbusmenu-gtk3
 

=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2010-11-11 14:15:20 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2010-12-08 03:19:55 +0000
@@ -291,7 +291,6 @@
 	}
 
 	item->priv->check_type = check_type;
-	GValue value = {0};
 
 	switch (item->priv->check_type) {
 	case GENERICMENUITEM_CHECK_TYPE_NONE:
@@ -300,14 +299,10 @@
 		   check on the item. */
 		break;
 	case GENERICMENUITEM_CHECK_TYPE_CHECKBOX:
-		g_value_init(&value, G_TYPE_BOOLEAN);
-		g_value_set_boolean(&value, FALSE);
-		g_object_set_property(G_OBJECT(item), "draw-as-radio", &value);
+		gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item), FALSE);
 		break;
 	case GENERICMENUITEM_CHECK_TYPE_RADIO:
-		g_value_init(&value, G_TYPE_BOOLEAN);
-		g_value_set_boolean(&value, TRUE);
-		g_object_set_property(G_OBJECT(item), "draw-as-radio", &value);
+		gtk_check_menu_item_set_draw_as_radio(GTK_CHECK_MENU_ITEM(item), TRUE);
 		break;
 	default:
 		g_warning("Generic Menuitem invalid check type: %d", check_type);

=== modified file 'libdbusmenu-gtk/menuitem.c'
--- libdbusmenu-gtk/menuitem.c	2010-11-11 14:15:20 +0000
+++ libdbusmenu-gtk/menuitem.c	2010-12-08 03:19:55 +0000
@@ -29,7 +29,6 @@
 #include "menuitem.h"
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <dbus/dbus-gtype-specialized.h>
 
 /**
 	dbusmenu_menuitem_property_set_image:
@@ -178,50 +177,31 @@
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
 	g_return_val_if_fail(gtk_accelerator_valid(key, modifier), FALSE);
 
-	GArray * array = g_array_sized_new(TRUE, TRUE, sizeof(gchar *), 4); /* Four seems like the max we'd need, plus it's still small */
-
-	const gchar * control_val = DBUSMENU_MENUITEM_SHORTCUT_CONTROL;
-	const gchar * alt_val = DBUSMENU_MENUITEM_SHORTCUT_ALT;
-	const gchar * shift_val = DBUSMENU_MENUITEM_SHORTCUT_SHIFT;
-	const gchar * super_val = DBUSMENU_MENUITEM_SHORTCUT_SUPER;
+	GVariantBuilder builder;
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
 
 	if (modifier & GDK_CONTROL_MASK) {
-		g_array_append_val(array, control_val);
+		g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_CONTROL);
 	}
 	if (modifier & GDK_MOD1_MASK) {
-		g_array_append_val(array, alt_val);
+		g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_ALT);
 	}
 	if (modifier & GDK_SHIFT_MASK) {
-		g_array_append_val(array, shift_val);
+		g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_SHIFT);
 	}
 	if (modifier & GDK_SUPER_MASK) {
-		g_array_append_val(array, super_val);
+		g_variant_builder_add(&builder, "s", DBUSMENU_MENUITEM_SHORTCUT_SUPER);
 	}
 
 	const gchar * keyname = gdk_keyval_name(key);
-	g_array_append_val(array, keyname);
-
-	GType type = dbus_g_type_get_collection("GPtrArray", G_TYPE_STRV);
-	GPtrArray * wrapper = (GPtrArray *)dbus_g_type_specialized_construct(type);
-
-	GValue value = {0,};
-	g_value_init(&value, type);
-	g_value_take_boxed(&value, wrapper);
-
-	DBusGTypeSpecializedAppendContext ctx;
-	dbus_g_type_specialized_init_append(&value, &ctx);
-
-	GValue strval = {0,};
-	g_value_init(&strval, G_TYPE_STRV);
-	g_value_take_boxed(&strval, array->data);
-	g_array_free(array, FALSE);
-
-	dbus_g_type_specialized_collection_append(&ctx, &strval);
-	dbus_g_type_specialized_collection_end_append(&ctx);
-
-	dbusmenu_menuitem_property_set_value(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT, &value);
-
-	return TRUE;
+	g_variant_builder_add(&builder, "s", keyname);
+
+	GVariant * inside = g_variant_builder_end(&builder);
+	g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+	g_variant_builder_add_value(&builder, inside);
+	GVariant * outsidevariant = g_variant_builder_end(&builder);
+
+	return dbusmenu_menuitem_property_set_variant(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT, outsidevariant);
 }
 
 /* Look at the closures in an accel group and find
@@ -279,68 +259,6 @@
 	return dbusmenu_menuitem_property_set_shortcut(menuitem, key->accel_key, key->accel_mods);
 }
 
-/* A set of typed data for the interator */
-typedef struct _iter_data_t iter_data_t;
-struct _iter_data_t {
-	guint * key;
-	GdkModifierType * modifier;
-};
-
-/* Goes through the wrapper items.  In reality we only support one
-   so it checks to see if a key is set first.  But, we could possibly,
-   support more in the future. */
-static void
-_wrapper_iterator (const GValue * value, gpointer user_data)
-{
-	iter_data_t * iter_data = (iter_data_t *)user_data;
-
-	if (*iter_data->key != 0) {
-		g_warning("Shortcut is more than one entry.  Which we don't currently support.  Taking the first.");
-		return;
-	}
-
-	if (!G_VALUE_HOLDS(value, G_TYPE_STRV)) {
-		g_warning("Unexpected shortcut structure.  Value array is: %s", G_VALUE_TYPE_NAME(value));
-		return;
-	}
-
-	gchar ** stringarray = (gchar **)g_value_get_boxed(value);
-	if (stringarray == NULL) {
-		return;
-	}
-
-	const gchar * last_string = NULL;
-	int i;
-
-	for (i = 0; stringarray[i] != NULL; i++) {
-		last_string = stringarray[i];
-
-		if (g_strcmp0(last_string, DBUSMENU_MENUITEM_SHORTCUT_CONTROL) == 0) {
-			*iter_data->modifier |= GDK_CONTROL_MASK;
-			continue;
-		}
-		if (g_strcmp0(last_string, DBUSMENU_MENUITEM_SHORTCUT_ALT) == 0) {
-			*iter_data->modifier |= GDK_MOD1_MASK;
-			continue;
-		}
-		if (g_strcmp0(last_string, DBUSMENU_MENUITEM_SHORTCUT_SHIFT) == 0) {
-			*iter_data->modifier |= GDK_SHIFT_MASK;
-			continue;
-		}
-		if (g_strcmp0(last_string, DBUSMENU_MENUITEM_SHORTCUT_SUPER) == 0) {
-			*iter_data->modifier |= GDK_SUPER_MASK;
-			continue;
-		}
-	}
-
-	if (last_string != NULL) {
-		GdkModifierType tempmod;
-		gtk_accelerator_parse(last_string, iter_data->key, &tempmod);
-	}	
-
-	return;
-}
-
 /**
 	dbusmenu_menuitem_property_get_shortcut:
 	@menuitem: The #DbusmenuMenuitem to get the shortcut off
@@ -358,20 +276,37 @@
 
 	g_return_if_fail(DBUSMENU_IS_MENUITEM(menuitem));
 
-	const GValue * wrapper = dbusmenu_menuitem_property_get_value(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT);
+	GVariant * wrapper = dbusmenu_menuitem_property_get_variant(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT);
 	if (wrapper == NULL) {
 		return;
 	}
-	if (!dbus_g_type_is_collection(G_VALUE_TYPE(wrapper))) {
-		g_warning("Unexpected shortcut structure.  Wrapper is: %s", G_VALUE_TYPE_NAME(wrapper));
+
+	if (g_variant_n_children(wrapper) != 1) {
+		g_warning("Unable to parse shortcut, too many keys");
+		g_variant_unref(wrapper);
 		return;
 	}
 
-	iter_data_t iter_data;
-	iter_data.key = key;
-	iter_data.modifier = modifier;
-
-	dbus_g_type_collection_value_iterate(wrapper, _wrapper_iterator, &iter_data);
+	GVariantIter iter;
+	g_variant_iter_init(&iter, g_variant_get_child_value(wrapper, 0));
+	gchar * string;
+
+	while(g_variant_iter_next(&iter, "s", &string)) {
+		if (g_strcmp0(string, DBUSMENU_MENUITEM_SHORTCUT_CONTROL) == 0) {
+			*modifier |= GDK_CONTROL_MASK;
+		} else if (g_strcmp0(string, DBUSMENU_MENUITEM_SHORTCUT_ALT) == 0) {
+			*modifier |= GDK_MOD1_MASK;
+		} else if (g_strcmp0(string, DBUSMENU_MENUITEM_SHORTCUT_SHIFT) == 0) {
+			*modifier |= GDK_SHIFT_MASK;
+		} else if (g_strcmp0(string, DBUSMENU_MENUITEM_SHORTCUT_SUPER) == 0) {
+			*modifier |= GDK_SUPER_MASK;
+		} else {
+			GdkModifierType tempmod;
+			gtk_accelerator_parse(string, key, &tempmod);
+		}
+
+		g_free(string);
+	}
 
 	return;
 }

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-08-27 19:31:44 +0000
+++ tests/Makefile.am	2010-12-08 03:19:55 +0000
@@ -52,7 +52,7 @@
 
 lib_LTLIBRARIES = libdbusmenu-jsonloader.la
 
-libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-0.1/libdbusmenu-jsonloader/
+libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-jsonloader/
 
 libdbusmenu_jsonloaderinclude_HEADERS = \
 	json-loader.h
@@ -80,7 +80,7 @@
 	$(DBUSMENUGLIB_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
-pkgconfig_DATA = dbusmenu-jsonloader.pc
+pkgconfig_DATA = dbusmenu-jsonloader-0.4.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
 ######################

=== renamed file 'tests/dbusmenu-jsonloader.pc.in' => 'tests/dbusmenu-jsonloader-0.4.pc.in'
=== modified file 'tests/json-loader.c'
--- tests/json-loader.c	2010-06-29 03:39:59 +0000
+++ tests/json-loader.c	2010-12-08 03:19:55 +0000
@@ -20,115 +20,76 @@
 */
 
 #include "json-loader.h"
-#include <dbus/dbus-gtype-specialized.h>
-
-static GValue *
-node2value (JsonNode * node)
+
+static GVariant * node2variant (JsonNode * node);
+
+static void
+array_foreach (JsonArray * array, guint index, JsonNode * node, gpointer user_data)
+{
+	GVariantBuilder * builder = (GVariantBuilder *)user_data;
+	GVariant * variant = node2variant(node);
+	if (variant != NULL) {
+		g_variant_builder_add_value(builder, variant);
+	}
+	return;
+}
+
+static void
+object_foreach (JsonObject * array, const gchar * member, JsonNode * node, gpointer user_data)
+{
+	GVariantBuilder * builder = (GVariantBuilder *)user_data;
+	GVariant * variant = node2variant(node);
+	if (variant != NULL) {
+		g_variant_builder_add(builder, "{sv}", member, variant);
+	}
+	return;
+}
+
+static GVariant *
+node2variant (JsonNode * node)
 {
 	if (node == NULL) {
 		return NULL;
 	}
 
-	GValue * value = g_new0(GValue, 1);
-
 	if (JSON_NODE_TYPE(node) == JSON_NODE_VALUE) {
-		json_node_get_value(node, value);
-		return value;
+		switch (json_node_get_value_type(node)) {
+		case G_TYPE_INT:
+		case G_TYPE_INT64:
+			return g_variant_new_int32(json_node_get_int(node));
+		case G_TYPE_DOUBLE:
+		case G_TYPE_FLOAT:
+			return g_variant_new_double(json_node_get_double(node));
+		case G_TYPE_BOOLEAN:
+			return g_variant_new_boolean(json_node_get_boolean(node));
+		case G_TYPE_STRING:
+			return g_variant_new_string(json_node_get_string(node));
+		default:
+			g_assert_not_reached();
+		}
 	}
 
 	if (JSON_NODE_TYPE(node) == JSON_NODE_ARRAY) {
+		GVariantBuilder builder;
+		g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);
+
 		JsonArray * array = json_node_get_array(node);
-		JsonNode * first = json_array_get_element(array, 0);
-
-		if (JSON_NODE_TYPE(first) == JSON_NODE_VALUE) {
-			GValue subvalue = {0};
-			json_node_get_value(first, &subvalue);
-
-			if (G_VALUE_TYPE(&subvalue) == G_TYPE_STRING) {
-				GArray * garray = g_array_sized_new(TRUE, TRUE, sizeof(gchar *), json_array_get_length(array));
-				g_value_init(value, G_TYPE_STRV);
-				g_value_take_boxed(value, garray->data);
-
-				int i;
-				for (i = 0; i < json_array_get_length(array); i++) {
-					const gchar * str = json_node_get_string(json_array_get_element(array, i));
-					gchar * dupstr = g_strdup(str);
-					g_array_append_val(garray, dupstr);
-				}
-
-				g_array_free(garray, FALSE);
-			} else {
-				GValueArray * varray = g_value_array_new(json_array_get_length(array));
-				g_value_init(value, G_TYPE_VALUE_ARRAY);
-				g_value_take_boxed(value, varray);
-
-				g_value_array_append(varray, &subvalue);
-				g_value_unset(&subvalue);
-
-				int i;
-				for (i = 1; i < json_array_get_length(array); i++) {
-					json_node_get_value(first, &subvalue);
-					g_value_array_append(varray, &subvalue);
-					g_value_unset(&subvalue);
-				}
-			}
-
-		} else {
-			GValue * subvalue = node2value(first);
-			GType type = dbus_g_type_get_collection("GPtrArray", G_VALUE_TYPE(subvalue));
-			gpointer * wrapper = dbus_g_type_specialized_construct(type);
-
-			g_value_init(value, type);
-			g_value_take_boxed(value, wrapper);
-
-			DBusGTypeSpecializedAppendContext ctx;
-			dbus_g_type_specialized_init_append(value, &ctx);
-
-			dbus_g_type_specialized_collection_append(&ctx, subvalue);
-			int i;
-			for (i = 1; i < json_array_get_length(array); i++) {
-				GValue * subvalue = node2value(node);
-				dbus_g_type_specialized_collection_append(&ctx, subvalue);
-			}
-
-			dbus_g_type_specialized_collection_end_append(&ctx);
-		}
+		json_array_foreach_element(array, array_foreach, &builder);
+
+		return g_variant_builder_end(&builder);
 	}
 
 	if (JSON_NODE_TYPE(node) == JSON_NODE_OBJECT) {
-		JsonObject * obj = json_node_get_object(node);
-
-		GType type = dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
-		GHashTable * hash = (GHashTable *)dbus_g_type_specialized_construct(type);
-
-		g_value_init(value, type);
-		g_value_take_boxed(value, hash);
-
-		DBusGTypeSpecializedAppendContext ctx;
-		dbus_g_type_specialized_init_append(value, &ctx);
-		
-		GList * members = NULL;
-		for (members = json_object_get_members(obj); members != NULL; members = g_list_next(members)) {
-			const gchar * member = members->data;
-
-			JsonNode * lnode = json_object_get_member(obj, member);
-			GValue * value = node2value(lnode);
-
-			if (value != NULL) {
-				GValue name = {0};
-				g_value_init(&name, G_TYPE_STRING);
-				g_value_set_static_string(&name, member);
-
-				dbus_g_type_specialized_map_append(&ctx, &name, value);
-			
-				g_value_unset(&name);
-				g_value_unset(value);
-				g_free(value);
-			}
-		}
+		GVariantBuilder builder;
+		g_variant_builder_init(&builder, G_VARIANT_TYPE_DICTIONARY);
+
+		JsonObject * array = json_node_get_object(node);
+		json_object_foreach_member(array, object_foreach, &builder);
+
+		return g_variant_builder_end(&builder);
 	}
 
-	return value;
+	return NULL;
 }
 
 static void
@@ -144,12 +105,11 @@
 		if (!g_strcmp0(member, "submenu")) { continue; }
 
 		JsonNode * lnode = json_object_get_member(node, member);
-		GValue * value = node2value(lnode);
+		GVariant * variant = node2variant(lnode);
 
-		if (value != NULL) {
-			dbusmenu_menuitem_property_set_value(mi, member, value);
-			g_value_unset(value);
-			g_free(value);
+		if (variant != NULL) {
+			dbusmenu_menuitem_property_set_variant(mi, member, variant);
+			g_variant_unref(variant);
 		}
 	}
 

=== modified file 'tests/test-glib-events-client.c'
--- tests/test-glib-events-client.c	2010-08-27 20:57:42 +0000
+++ tests/test-glib-events-client.c	2010-12-08 03:19:55 +0000
@@ -35,7 +35,7 @@
 static gboolean first = TRUE;
 
 static void
-event_status (DbusmenuClient * client, DbusmenuMenuitem * item, gchar * name, GValue * data, guint timestamp, GError * error, gpointer user_data)
+event_status (DbusmenuClient * client, DbusmenuMenuitem * item, gchar * name, GVariant * data, guint timestamp, GError * error, gpointer user_data)
 {
 	g_debug("Event status: %s", error == NULL ? "Sent" : "Error");
 
@@ -46,8 +46,8 @@
 		return;
 	}
 
-	if (g_value_get_int(data) != DATA_VALUE) {
-		g_debug("Data value pass fail got: %d", g_value_get_int(data));
+	if (g_variant_get_int32(data) != DATA_VALUE) {
+		g_debug("Data value pass fail got: %d", g_variant_get_int32(g_variant_get_child_value(data, 0)));
 		passed = FALSE;
 		g_main_loop_quit(mainloop);
 		return;
@@ -96,11 +96,8 @@
 		return;
 	}
 
-	GValue data = {0};
-	g_value_init(&data, G_TYPE_INT);
-	g_value_set_int(&data, DATA_VALUE);
-
-	dbusmenu_menuitem_handle_event(menuroot, "clicked", &data, TIMESTAMP_VALUE);
+	GVariant * data = g_variant_new_int32(DATA_VALUE);
+	dbusmenu_menuitem_handle_event(menuroot, "clicked", data, TIMESTAMP_VALUE);
 
 	return;
 }
@@ -128,6 +125,7 @@
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
 
+	g_debug("Main loop complete");
 	g_object_unref(G_OBJECT(client));
 
 	if (passed) {

=== modified file 'tests/test-glib-events-server.c'
--- tests/test-glib-events-server.c	2010-08-27 20:29:49 +0000
+++ tests/test-glib-events-server.c	2010-12-08 03:19:55 +0000
@@ -20,11 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
@@ -49,35 +45,40 @@
 	return FALSE;
 }
 
-int
-main (int argc, char ** argv)
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
 {
-	GError * error = NULL;
-
-	g_type_init();
-
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "org.dbusmenu.test", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
 	server = dbusmenu_server_new("/org/test");
 	DbusmenuMenuitem * menuitem = dbusmenu_menuitem_new();
 	dbusmenu_server_set_root(server, menuitem);
 
 	g_signal_connect(G_OBJECT(menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(handle_event), NULL);
 
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "org.dbusmenu.test",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
+
 	g_timeout_add_seconds(3, timer_func, NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);

=== modified file 'tests/test-glib-layout-server.c'
--- tests/test-glib-layout-server.c	2010-08-02 22:03:59 +0000
+++ tests/test-glib-layout-server.c	2010-12-08 03:19:55 +0000
@@ -20,11 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
@@ -72,33 +68,38 @@
 	return TRUE;
 }
 
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	server = dbusmenu_server_new("/org/test");
+
+	timer_func(NULL);
+	g_timeout_add(2500, timer_func, NULL);
+
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 int
 main (int argc, char ** argv)
 {
-	GError * error = NULL;
-
 	g_type_init();
 
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "org.dbusmenu.test", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	server = dbusmenu_server_new("/org/test");
-
-	timer_func(NULL);
-	g_timeout_add(2500, timer_func, NULL);
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "org.dbusmenu.test",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);

=== modified file 'tests/test-glib-objects.c'
--- tests/test-glib-objects.c	2010-02-05 05:40:32 +0000
+++ tests/test-glib-objects.c	2010-12-08 03:19:55 +0000
@@ -77,17 +77,17 @@
 {
 	/* Build a menu item */
 	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
-	const GValue * out = NULL;
+	GVariant * out = NULL;
 
 	/* Test to make sure it's a happy object */
 	g_assert(item != NULL);
 
 	/* Setting a string */
 	dbusmenu_menuitem_property_set(item, "string", "value");
-	out = dbusmenu_menuitem_property_get_value(item, "string");
+	out = dbusmenu_menuitem_property_get_variant(item, "string");
 	g_assert(out != NULL);
-	g_assert(G_VALUE_TYPE(out) == G_TYPE_STRING);
-	g_assert(!g_strcmp0(g_value_get_string(out), "value"));
+	g_assert(g_variant_type_equal(g_variant_get_type(out), G_VARIANT_TYPE_STRING));
+	g_assert(!g_strcmp0(g_variant_get_string(out, NULL), "value"));
 	g_assert(!g_strcmp0(dbusmenu_menuitem_property_get(item, "string"), "value"));
 
 	g_object_unref(item);
@@ -101,17 +101,17 @@
 {
 	/* Build a menu item */
 	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
-	const GValue * out = NULL;
+	GVariant * out = NULL;
 
 	/* Test to make sure it's a happy object */
 	g_assert(item != NULL);
 
 	/* Setting a string */
 	dbusmenu_menuitem_property_set_int(item, "int", 12345);
-	out = dbusmenu_menuitem_property_get_value(item, "int");
+	out = dbusmenu_menuitem_property_get_variant(item, "int");
 	g_assert(out != NULL);
-	g_assert(G_VALUE_TYPE(out) == G_TYPE_INT);
-	g_assert(g_value_get_int(out) == 12345);
+	g_assert(g_variant_type_equal(g_variant_get_type(out), G_VARIANT_TYPE_INT32));
+	g_assert(g_variant_get_int32(out) == 12345);
 	g_assert(dbusmenu_menuitem_property_get_int(item, "int") == 12345);
 
 	g_object_unref(item);
@@ -125,18 +125,18 @@
 {
 	/* Build a menu item */
 	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
-	const GValue * out = NULL;
+	GVariant * out = NULL;
 
 	/* Test to make sure it's a happy object */
 	g_assert(item != NULL);
 
 	/* Setting a string */
 	dbusmenu_menuitem_property_set_bool(item, "boolean", TRUE);
-	out = dbusmenu_menuitem_property_get_value(item, "boolean");
+	out = dbusmenu_menuitem_property_get_variant(item, "boolean");
 	g_assert(out != NULL);
-	g_assert(G_VALUE_TYPE(out) == G_TYPE_BOOLEAN);
-	g_assert(g_value_get_boolean(out));
-	g_assert(dbusmenu_menuitem_property_get_int(item, "boolean"));
+	g_assert(g_variant_type_equal(g_variant_get_type(out), G_VARIANT_TYPE_BOOLEAN));
+	g_assert(g_variant_get_boolean(out));
+	/* g_assert(dbusmenu_menuitem_property_get_int(item, "boolean") == 0); */
 
 	g_object_unref(item);
 
@@ -177,7 +177,7 @@
 
 /* A helper to put a value into a pointer for eval. */
 static void
-test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * property, GValue * value, GValue ** out)
+test_object_menuitem_props_signals_helper (DbusmenuMenuitem * mi, gchar * property, GVariant * value, GVariant ** out)
 {
 	if (!g_strcmp0(property, "swapper")) {
 		*out = value;
@@ -194,7 +194,7 @@
 {
 	/* Build a menu item */
 	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
-	GValue * out = NULL;
+	GVariant * out = NULL;
 
 	/* Test to make sure it's a happy object */
 	g_assert(item != NULL);
@@ -205,25 +205,25 @@
 	/* Setting a boolean */
 	dbusmenu_menuitem_property_set_bool(item, "swapper", TRUE);
 	g_assert(out != NULL);
-	g_assert(g_value_get_boolean(out));
+	g_assert(g_variant_get_boolean(out));
 	out = NULL;
 
 	/* Setting a int */
 	dbusmenu_menuitem_property_set_int(item, "swapper", 5432);
 	g_assert(out != NULL);
-	g_assert(g_value_get_int(out) == 5432);
+	g_assert(g_variant_get_int32(out) == 5432);
 	out = NULL;
 
 	/* Setting a string */
 	dbusmenu_menuitem_property_set(item, "swapper", "mystring");
 	g_assert(out != NULL);
-	g_assert(!g_strcmp0(g_value_get_string(out), "mystring"));
+	g_assert(!g_strcmp0(g_variant_get_string(out, NULL), "mystring"));
 	out = NULL;
 
 	/* Setting a boolean */
 	dbusmenu_menuitem_property_set_bool(item, "swapper", FALSE);
 	g_assert(out != NULL);
-	g_assert(!g_value_get_boolean(out));
+	g_assert(!g_variant_get_boolean(out));
 	out = NULL;
 
 	g_object_unref(item);

=== modified file 'tests/test-glib-properties-server.c'
--- tests/test-glib-properties-server.c	2010-02-05 18:10:47 +0000
+++ tests/test-glib-properties-server.c	2010-12-08 03:19:55 +0000
@@ -20,10 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
@@ -91,8 +88,6 @@
 {
 	g_type_init();
 
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
 	server = dbusmenu_server_new("/org/test");
 
 	timer_func(NULL);

=== modified file 'tests/test-glib-proxy-client.c'
--- tests/test-glib-proxy-client.c	2010-02-19 21:41:56 +0000
+++ tests/test-glib-proxy-client.c	2010-12-08 03:19:55 +0000
@@ -150,10 +150,9 @@
 		g_main_loop_quit(mainloop);
 	}
 
-	GValue value = {0};
-	g_value_init(&value, G_TYPE_INT);
-	g_value_set_int(&value, 0);
-	dbusmenu_menuitem_handle_event(menuroot, "clicked", &value, layouton);
+	GVariant * value = g_variant_new("i", 0);
+	dbusmenu_menuitem_handle_event(menuroot, "clicked", value, layouton);
+	g_variant_unref(value);
 
 	return FALSE;
 }

=== modified file 'tests/test-glib-proxy-proxy.c'
--- tests/test-glib-proxy-proxy.c	2010-02-25 03:58:50 +0000
+++ tests/test-glib-proxy-proxy.c	2010-12-08 03:19:55 +0000
@@ -1,9 +1,5 @@
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/menuitem-proxy.h>
@@ -32,6 +28,24 @@
 	return;
 }
 
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	client = dbusmenu_client_new((gchar *)user_data, "/org/test");
+
+	g_signal_connect(client, DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED, G_CALLBACK(root_changed), server);
+
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 int
 main (int argc, char ** argv)
 {
@@ -47,28 +61,16 @@
 
 	g_debug("I am '%s' and I'm proxying '%s'", whoami, myproxy);
 
-	GError * error = NULL;
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(connection)));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, whoami, 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
 	server = dbusmenu_server_new("/org/test");
-	client = dbusmenu_client_new(myproxy, "/org/test");
 
-	g_signal_connect(client, DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED, G_CALLBACK(root_changed), server);
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               whoami,
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               myproxy,
+	               NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);

=== modified file 'tests/test-glib-proxy-server.c'
--- tests/test-glib-proxy-server.c	2010-02-19 21:16:29 +0000
+++ tests/test-glib-proxy-server.c	2010-12-08 03:19:55 +0000
@@ -20,11 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
@@ -104,31 +100,36 @@
 	return;
 }
 
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	server = dbusmenu_server_new("/org/test");
+	layout_change(NULL, 0, NULL);
+
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 int
 main (int argc, char ** argv)
 {
 	g_type_init();
 
-	GError * error = NULL;
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(connection)));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "test.proxy.server", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	server = dbusmenu_server_new("/org/test");
-	layout_change(NULL, 0, NULL);
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "test.proxy.server",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);

=== modified file 'tests/test-glib-simple-items.c'
--- tests/test-glib-simple-items.c	2009-09-30 19:58:04 +0000
+++ tests/test-glib-simple-items.c	2010-12-08 03:19:55 +0000
@@ -1,6 +1,3 @@
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
 

=== modified file 'tests/test-glib-submenu-server.c'
--- tests/test-glib-submenu-server.c	2010-06-08 15:19:37 +0000
+++ tests/test-glib-submenu-server.c	2010-12-08 03:19:55 +0000
@@ -20,11 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
@@ -72,33 +68,38 @@
 	return TRUE;
 }
 
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	server = dbusmenu_server_new("/org/test");
+
+	timer_func(NULL);
+	g_timeout_add(2500, timer_func, NULL);
+
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 int
 main (int argc, char ** argv)
 {
-	GError * error = NULL;
-
 	g_type_init();
 
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "org.dbusmenu.test", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	server = dbusmenu_server_new("/org/test");
-
-	timer_func(NULL);
-	g_timeout_add(2500, timer_func, NULL);
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "org.dbusmenu.test",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);

=== modified file 'tests/test-gtk-label-server.c'
--- tests/test-gtk-label-server.c	2010-06-28 20:55:53 +0000
+++ tests/test-gtk-label-server.c	2010-12-08 03:19:55 +0000
@@ -20,11 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
@@ -53,6 +49,25 @@
 	return TRUE;
 }
 
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	server = dbusmenu_server_new("/org/test");
+
+	timer_func(NULL);
+	g_timeout_add_seconds(5, timer_func, NULL);
+
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 int
 main (int argc, char ** argv)
 {
@@ -73,26 +88,15 @@
 	root_array = json_node_get_array(root_node);
 	g_debug("%d layouts in test description '%s'", json_array_get_length(root_array), argv[1]);
 
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "glib.label.test", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	server = dbusmenu_server_new("/org/test");
-
-	timer_func(NULL);
-	g_timeout_add_seconds(5, timer_func, NULL);
+
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "glib.label.test",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);

=== modified file 'tests/test-gtk-objects.c'
--- tests/test-gtk-objects.c	2010-06-14 19:52:26 +0000
+++ tests/test-gtk-objects.c	2010-12-08 03:19:55 +0000
@@ -72,7 +72,7 @@
 	g_object_unref(pixbuf);
 
 	/* Check to see if it's set */
-	const GValue * val = dbusmenu_menuitem_property_get_value(item, prop_name);
+	GVariant * val = dbusmenu_menuitem_property_get_variant(item, prop_name);
 	g_assert(val != NULL);
 
 	/* Get the pixbuf back! */
@@ -105,7 +105,7 @@
 	g_assert(success);
 
 	/* Check for value */
-	const GValue * val = dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_SHORTCUT);
+	GVariant * val = dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_SHORTCUT);
 	g_assert(val != NULL);
 
 	/* Check to see if we love it */

=== modified file 'tests/test-gtk-reorder-server.c'
--- tests/test-gtk-reorder-server.c	2010-07-22 09:31:48 +0000
+++ tests/test-gtk-reorder-server.c	2010-12-08 03:19:55 +0000
@@ -20,11 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
@@ -73,29 +69,9 @@
 	return TRUE;
 }
 
-int
-main (int argc, char ** argv)
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
 {
-	GError * error = NULL;
-
-	g_type_init();
-
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "glib.label.test", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
 	server = dbusmenu_server_new("/org/test");
 	root = dbusmenu_menuitem_new();
 	dbusmenu_server_set_root(server, root);
@@ -109,6 +85,31 @@
 	timer_func(NULL);
 	g_timeout_add_seconds(5, timer_func, NULL);
 
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "glib.label.test",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
+
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);
 

=== modified file 'tests/test-gtk-shortcut-server.c'
--- tests/test-gtk-shortcut-server.c	2010-06-15 19:42:35 +0000
+++ tests/test-gtk-shortcut-server.c	2010-12-08 03:19:55 +0000
@@ -20,13 +20,9 @@
 */
 
 #include <glib.h>
+#include <gio/gio.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
-
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-gtk/menuitem.h>
@@ -61,33 +57,38 @@
 	return;
 }
 
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	server = dbusmenu_server_new("/org/test");
+	build_menu();
+
+	g_timeout_add_seconds(10, timer_func, NULL);
+
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 int
 main (int argc, char ** argv)
 {
-	GError * error = NULL;
-
 	g_type_init();
 
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "glib.label.test", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
-	server = dbusmenu_server_new("/org/test");
-	build_menu();
-
-	g_timeout_add_seconds(10, timer_func, NULL);
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "glib.label.test",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);
 	g_main_loop_run(mainloop);

=== modified file 'tests/test-gtk-submenu-server.c'
--- tests/test-gtk-submenu-server.c	2010-08-20 21:52:02 +0000
+++ tests/test-gtk-submenu-server.c	2010-12-08 03:19:55 +0000
@@ -20,11 +20,7 @@
 */
 
 #include <glib.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-#include <dbus/dbus-glib-bindings.h>
+#include <gio/gio.h>
 
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
@@ -59,29 +55,9 @@
 	return item;
 }
 
-int
-main (int argc, char ** argv)
+static void
+on_bus (GDBusConnection * connection, const gchar * name, gpointer user_data)
 {
-	GError * error = NULL;
-
-	g_type_init();
-
-	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
-
-	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	guint nameret = 0;
-
-	if (!org_freedesktop_DBus_request_name(bus_proxy, "glib.label.test", 0, &nameret, &error)) {
-		g_error("Unable to call to request name");
-		return 1;
-	}
-
-	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-		g_error("Unable to get name");
-		return 1;
-	}
-
 	DbusmenuServer * server = dbusmenu_server_new("/org/test");
 	DbusmenuMenuitem * root = dbusmenu_menuitem_new();
 	dbusmenu_server_set_root(server, root);
@@ -101,6 +77,31 @@
 
 	g_timeout_add_seconds(4, show_item, item);
 
+	return;
+}
+
+static void
+name_lost (GDBusConnection * connection, const gchar * name, gpointer user_data)
+{
+	g_error("Unable to get name '%s' on DBus", name);
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	g_bus_own_name(G_BUS_TYPE_SESSION,
+	               "glib.label.test",
+	               G_BUS_NAME_OWNER_FLAGS_NONE,
+	               on_bus,
+	               NULL,
+	               name_lost,
+	               NULL,
+	               NULL);
+
     g_timeout_add_seconds(6, timer_func, NULL);
 
 	mainloop = g_main_loop_new(NULL, FALSE);

=== modified file 'tests/test-json-01.json'
--- tests/test-json-01.json	2010-08-12 16:11:13 +0000
+++ tests/test-json-01.json	2010-12-08 03:19:55 +0000
@@ -1,127 +1,127 @@
 {
   "id": 0,
-  "children-display": "submenu",
+  "children-display": 'submenu',
   "submenu": [
       {
         "id": 5,
-        "children-display": "submenu",
+        "children-display": 'submenu',
         "enabled": true,
-        "label": "File",
+        "label": 'File',
         "visible": true,
         "submenu": [
             {
               "id": 6,
               "enabled": true,
-              "label": "Quit",
-              "shortcut": [["Control", "q"]],
+              "label": 'Quit',
+              "shortcut": [['Control', 'q']],
               "visible": true
             },
             {
               "id": 7,
               "enabled": true,
-              "label": "Close all",
-              "shortcut": [["Control", "Shift", "w"]],
+              "label": 'Close all',
+              "shortcut": [['Control', 'Shift', 'w']],
               "visible": true
             },
             {
               "id": 8,
               "enabled": true,
-              "label": "Close",
-              "shortcut": [["Control", "w"]],
+              "label": 'Close',
+              "shortcut": [['Control', 'w']],
               "visible": true
             },
             {
               "id": 9,
-              "type": "separator"
+              "type": 'separator'
             },
             {
               "id": 10,
               "enabled": true,
-              "label": "Send by Email...",
+              "label": 'Send by Email...',
               "visible": true
             },
             {
               "id": 11,
               "enabled": true,
-              "label": "Print...",
-              "shortcut": [["Control", "p"]],
+              "label": 'Print...',
+              "shortcut": [['Control', 'p']],
               "visible": true
             },
             {
               "id": 12,
               "enabled": true,
-              "label": "Page Setup",
+              "label": 'Page Setup',
               "visible": true
             },
             {
               "id": 13,
-              "type": "separator"
+              "type": 'separator'
             },
             {
               "id": 14,
               "enabled": true,
-              "label": "Revert",
+              "label": 'Revert',
               "visible": true
             },
             {
               "id": 15,
               "enabled": true,
-              "label": "Save as Template...",
+              "label": 'Save as Template...',
               "visible": true
             },
             {
               "id": 16,
               "enabled": true,
-              "label": "Save a Copy...",
+              "label": 'Save a Copy...',
               "visible": true
             },
             {
               "id": 17,
               "enabled": true,
-              "label": "Save As...",
-              "shortcut": [["Control", "Shift", "s"]],
+              "label": 'Save As...',
+              "shortcut": [['Control', 'Shift', 's']],
               "visible": true
             },
             {
               "id": 18,
               "enabled": true,
-              "label": "Save",
-              "shortcut": [["Control", "s"]],
+              "label": 'Save',
+              "shortcut": [['Control', 's']],
               "visible": true
             },
             {
               "id": 19,
-              "type": "separator"
+              "type": 'separator'
             },
             {
               "id": 20,
-              "children-display": "submenu",
+              "children-display": 'submenu',
               "enabled": true,
-              "label": "Open Recent",
+              "label": 'Open Recent',
               "visible": true,
               "submenu": [
                   {
                     "id": 21,
                     "enabled": true,
-                    "label": "Document History",
+                    "label": 'Document History',
                     "visible": true
                   },
                   {
                     "id": 22,
-                    "type": "separator"
+                    "type": 'separator'
                   },
                   {
                     "id": 23,
                     "enabled": true,
-                    "label": "giggity.jpg",
-                    "shortcut": [["Control", "2"]],
+                    "label": 'giggity.jpg',
+                    "shortcut": [['Control', '2']],
                     "visible": true
                   },
                   {
                     "id": 24,
                     "enabled": true,
-                    "label": "Icon Height.svg",
-                    "shortcut": [["Control", "1"]],
+                    "label": 'Icon Height.svg',
+                    "shortcut": [['Control', '1']],
                     "visible": true
                   }
               ]
@@ -129,150 +129,150 @@
             {
               "id": 25,
               "enabled": true,
-              "label": "Open Location...",
+              "label": 'Open Location...',
               "visible": true
             },
             {
               "id": 26,
               "enabled": true,
-              "label": "Open as Layers...",
-              "shortcut": [["Control", "Alt", "o"]],
+              "label": 'Open as Layers...',
+              "shortcut": [['Control', 'Alt', 'o']],
               "visible": true
             },
             {
               "id": 27,
               "enabled": true,
-              "label": "Open...",
-              "shortcut": [["Control", "o"]],
+              "label": 'Open...',
+              "shortcut": [['Control', 'o']],
               "visible": true
             },
             {
               "id": 28,
-              "children-display": "submenu",
+              "children-display": 'submenu',
               "enabled": true,
-              "label": "Create",
+              "label": 'Create',
               "visible": true,
               "submenu": [
                   {
                     "id": 29,
-                    "children-display": "submenu",
+                    "children-display": 'submenu',
                     "enabled": true,
-                    "label": "Web Page Themes",
+                    "label": 'Web Page Themes',
                     "visible": true,
                     "submenu": [
                         {
                           "id": 30,
-                          "children-display": "submenu",
+                          "children-display": 'submenu',
                           "enabled": true,
-                          "label": "Classic.Gimp.Org",
+                          "label": 'Classic.Gimp.Org',
                           "visible": true,
                           "submenu": [
                               {
                                 "id": 31,
                                 "enabled": true,
-                                "label": "Tube Sub-Sub-Button Label...",
+                                "label": 'Tube Sub-Sub-Button Label...',
                                 "visible": true
                               },
                               {
                                 "id": 32,
                                 "enabled": true,
-                                "label": "Tube Sub-Button Label...",
+                                "label": 'Tube Sub-Button Label...',
                                 "visible": true
                               },
                               {
                                 "id": 33,
                                 "enabled": true,
-                                "label": "Tube Button Label...",
+                                "label": 'Tube Button Label...',
                                 "visible": true
                               },
                               {
                                 "id": 34,
                                 "enabled": true,
-                                "label": "Small Header...",
+                                "label": 'Small Header...',
                                 "visible": true
                               },
                               {
                                 "id": 35,
                                 "enabled": true,
-                                "label": "General Tube Labels...",
+                                "label": 'General Tube Labels...',
                                 "visible": true
                               },
                               {
                                 "id": 36,
                                 "enabled": true,
-                                "label": "Big Header...",
+                                "label": 'Big Header...',
                                 "visible": true
                               }
                           ]
                         },
                         {
                           "id": 37,
-                          "children-display": "submenu",
+                          "children-display": 'submenu',
                           "enabled": true,
-                          "label": "Beveled Pattern",
+                          "label": 'Beveled Pattern',
                           "visible": true,
                           "submenu": [
                               {
                                 "id": 38,
                                 "enabled": true,
-                                "label": "Hrule...",
+                                "label": 'Hrule...',
                                 "visible": true
                               },
                               {
                                 "id": 39,
                                 "enabled": true,
-                                "label": "Heading...",
+                                "label": 'Heading...',
                                 "visible": true
                               },
                               {
                                 "id": 40,
                                 "enabled": true,
-                                "label": "Button...",
+                                "label": 'Button...',
                                 "visible": true
                               },
                               {
                                 "id": 41,
                                 "enabled": true,
-                                "label": "Bullet...",
+                                "label": 'Bullet...',
                                 "visible": true
                               },
                               {
                                 "id": 42,
                                 "enabled": true,
-                                "label": "Arrow...",
+                                "label": 'Arrow...',
                                 "visible": true
                               }
                           ]
                         },
                         {
                           "id": 43,
-                          "children-display": "submenu",
+                          "children-display": 'submenu',
                           "enabled": true,
-                          "label": "Alien Glow",
+                          "label": 'Alien Glow',
                           "visible": true,
                           "submenu": [
                               {
                                 "id": 44,
                                 "enabled": true,
-                                "label": "Hrule...",
+                                "label": 'Hrule...',
                                 "visible": true
                               },
                               {
                                 "id": 45,
                                 "enabled": true,
-                                "label": "Button...",
+                                "label": 'Button...',
                                 "visible": true
                               },
                               {
                                 "id": 46,
                                 "enabled": true,
-                                "label": "Bullet...",
+                                "label": 'Bullet...',
                                 "visible": true
                               },
                               {
                                 "id": 47,
                                 "enabled": true,
-                                "label": "Arrow...",
+                                "label": 'Arrow...',
                                 "visible": true
                               }
                           ]
@@ -281,274 +281,274 @@
                   },
                   {
                     "id": 48,
-                    "children-display": "submenu",
+                    "children-display": 'submenu',
                     "enabled": true,
-                    "label": "Patterns",
+                    "label": 'Patterns',
                     "visible": true,
                     "submenu": [
                         {
                           "id": 49,
                           "enabled": true,
-                          "label": "Truchet...",
+                          "label": 'Truchet...',
                           "visible": true
                         },
                         {
                           "id": 50,
                           "enabled": true,
-                          "label": "Swirly...",
+                          "label": 'Swirly...',
                           "visible": true
                         },
                         {
                           "id": 51,
                           "enabled": true,
-                          "label": "Swirl-Tile...",
+                          "label": 'Swirl-Tile...',
                           "visible": true
                         },
                         {
                           "id": 52,
                           "enabled": true,
-                          "label": "Render Map...",
+                          "label": 'Render Map...',
                           "visible": true
                         },
                         {
                           "id": 53,
                           "enabled": true,
-                          "label": "Land...",
+                          "label": 'Land...',
                           "visible": true
                         },
                         {
                           "id": 54,
                           "enabled": true,
-                          "label": "Flatland...",
+                          "label": 'Flatland...',
                           "visible": true
                         },
                         {
                           "id": 55,
                           "enabled": true,
-                          "label": "Camouflage...",
+                          "label": 'Camouflage...',
                           "visible": true
                         },