Import upstream version 0.3.2

5 files changed, 426 insertions, 2 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index cfa1399..f1b50bc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ TESTS = \
 	test-glib-properties \
 	test-glib-proxy \
 	test-glib-simple-items \
+	test-glib-submenu \
 	test-gtk-label \
 	test-gtk-reorder
 
@@ -20,6 +21,8 @@ check_PROGRAMS = \
 	test-glib-proxy-client \
 	test-glib-proxy-server \
 	test-glib-proxy-proxy \
+	test-glib-submenu-client \
+	test-glib-submenu-server \
 	test-gtk-label-client \
 	test-gtk-label-server \
 	test-glib-simple-items \
@@ -75,6 +78,38 @@ test_glib_layout_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+######################
+# Test Glib Submenu
+######################
+
+test-glib-submenu: test-glib-submenu-client test-glib-submenu-server Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(DBUS_RUNNER) --task ./test-glib-submenu-client --task-name Client --task ./test-glib-submenu-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
+test_glib_submenu_server_SOURCES = \
+	test-glib-submenu.h \
+	test-glib-submenu-server.c
+
+test_glib_submenu_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
+test_glib_submenu_client_SOURCES = \
+	test-glib-submenu.h \
+	test-glib-submenu-client.c
+
+test_glib_submenu_client_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_client_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
 
 ######################
 # Test Glib Object
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6f71436..3535eca 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -35,8 +35,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 TESTS = test-glib-objects-test test-glib-layout test-glib-properties \
-	test-glib-proxy test-glib-simple-items$(EXEEXT) test-gtk-label \
-	test-gtk-reorder
+	test-glib-proxy test-glib-simple-items$(EXEEXT) \
+	test-glib-submenu test-gtk-label test-gtk-reorder
 check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 	test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \
 	test-glib-layout-server$(EXEEXT) \
@@ -44,6 +44,8 @@ check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
 	test-glib-properties-server$(EXEEXT) \
 	test-glib-proxy-client$(EXEEXT) \
 	test-glib-proxy-server$(EXEEXT) test-glib-proxy-proxy$(EXEEXT) \
+	test-glib-submenu-client$(EXEEXT) \
+	test-glib-submenu-server$(EXEEXT) \
 	test-gtk-label-client$(EXEEXT) test-gtk-label-server$(EXEEXT) \
 	test-glib-simple-items$(EXEEXT) \
 	test-gtk-reorder-server$(EXEEXT)
@@ -153,6 +155,26 @@ test_glib_simple_items_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(test_glib_simple_items_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_test_glib_submenu_client_OBJECTS =  \
+	test_glib_submenu_client-test-glib-submenu-client.$(OBJEXT)
+test_glib_submenu_client_OBJECTS =  \
+	$(am_test_glib_submenu_client_OBJECTS)
+test_glib_submenu_client_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
+test_glib_submenu_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_glib_submenu_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_glib_submenu_server_OBJECTS =  \
+	test_glib_submenu_server-test-glib-submenu-server.$(OBJEXT)
+test_glib_submenu_server_OBJECTS =  \
+	$(am_test_glib_submenu_server_OBJECTS)
+test_glib_submenu_server_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
+test_glib_submenu_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_glib_submenu_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_test_gtk_label_client_OBJECTS =  \
 	test_gtk_label_client-test-gtk-label-client.$(OBJEXT)
 test_gtk_label_client_OBJECTS = $(am_test_gtk_label_client_OBJECTS)
@@ -223,6 +245,8 @@ SOURCES = $(glib_server_nomenu_SOURCES) \
 	$(test_glib_proxy_proxy_SOURCES) \
 	$(test_glib_proxy_server_SOURCES) \
 	$(test_glib_simple_items_SOURCES) \
+	$(test_glib_submenu_client_SOURCES) \
+	$(test_glib_submenu_server_SOURCES) \
 	$(test_gtk_label_client_SOURCES) \
 	$(test_gtk_label_server_SOURCES) \
 	$(test_gtk_reorder_server_SOURCES)
@@ -236,6 +260,8 @@ DIST_SOURCES = $(glib_server_nomenu_SOURCES) \
 	$(test_glib_proxy_proxy_SOURCES) \
 	$(test_glib_proxy_server_SOURCES) \
 	$(test_glib_simple_items_SOURCES) \
+	$(test_glib_submenu_client_SOURCES) \
+	$(test_glib_submenu_server_SOURCES) \
 	$(test_gtk_label_client_SOURCES) \
 	$(test_gtk_label_server_SOURCES) \
 	$(test_gtk_reorder_server_SOURCES)
@@ -293,6 +319,8 @@ DBUSMENUTESTS_CFLAGS = @DBUSMENUTESTS_CFLAGS@
 DBUSMENUTESTS_LIBS = @DBUSMENUTESTS_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -305,6 +333,11 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
 GREP = @GREP@
+GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_MKPDF = @GTKDOC_MKPDF@
+GTKDOC_REBASE = @GTKDOC_REBASE@
+HELP_DIR = @HELP_DIR@
+HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -346,6 +379,7 @@ NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -463,6 +497,30 @@ test_glib_layout_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+test_glib_submenu_server_SOURCES = \
+	test-glib-submenu.h \
+	test-glib-submenu-server.c
+
+test_glib_submenu_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
+test_glib_submenu_client_SOURCES = \
+	test-glib-submenu.h \
+	test-glib-submenu-client.c
+
+test_glib_submenu_client_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_submenu_client_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
 
 ######################
 # Test Glib Object
@@ -715,6 +773,12 @@ test-glib-proxy-server$(EXEEXT): $(test_glib_proxy_server_OBJECTS) $(test_glib_p
 test-glib-simple-items$(EXEEXT): $(test_glib_simple_items_OBJECTS) $(test_glib_simple_items_DEPENDENCIES) 
 	@rm -f test-glib-simple-items$(EXEEXT)
 	$(AM_V_CCLD)$(test_glib_simple_items_LINK) $(test_glib_simple_items_OBJECTS) $(test_glib_simple_items_LDADD) $(LIBS)
+test-glib-submenu-client$(EXEEXT): $(test_glib_submenu_client_OBJECTS) $(test_glib_submenu_client_DEPENDENCIES) 
+	@rm -f test-glib-submenu-client$(EXEEXT)
+	$(AM_V_CCLD)$(test_glib_submenu_client_LINK) $(test_glib_submenu_client_OBJECTS) $(test_glib_submenu_client_LDADD) $(LIBS)
+test-glib-submenu-server$(EXEEXT): $(test_glib_submenu_server_OBJECTS) $(test_glib_submenu_server_DEPENDENCIES) 
+	@rm -f test-glib-submenu-server$(EXEEXT)
+	$(AM_V_CCLD)$(test_glib_submenu_server_LINK) $(test_glib_submenu_server_OBJECTS) $(test_glib_submenu_server_LDADD) $(LIBS)
 test-gtk-label-client$(EXEEXT): $(test_gtk_label_client_OBJECTS) $(test_gtk_label_client_DEPENDENCIES) 
 	@rm -f test-gtk-label-client$(EXEEXT)
 	$(AM_V_CCLD)$(test_gtk_label_client_LINK) $(test_gtk_label_client_OBJECTS) $(test_gtk_label_client_LDADD) $(LIBS)
@@ -741,6 +805,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_proxy_proxy-test-glib-proxy-proxy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_proxy_server-test-glib-proxy-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_simple_items-test-glib-simple-items.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_label_server-test-gtk-label-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_gtk_reorder_server-test-gtk-reorder-server.Po@am__quote@
@@ -929,6 +995,38 @@ test_glib_simple_items-test-glib-simple-items.obj: test-glib-simple-items.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_simple_items_CFLAGS) $(CFLAGS) -c -o test_glib_simple_items-test-glib-simple-items.obj `if test -f 'test-glib-simple-items.c'; then $(CYGPATH_W) 'test-glib-simple-items.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-simple-items.c'; fi`
 
+test_glib_submenu_client-test-glib-submenu-client.o: test-glib-submenu-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -MT test_glib_submenu_client-test-glib-submenu-client.o -MD -MP -MF $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo -c -o test_glib_submenu_client-test-glib-submenu-client.o `test -f 'test-glib-submenu-client.c' || echo '$(srcdir)/'`test-glib-submenu-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-client.c' object='test_glib_submenu_client-test-glib-submenu-client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_client-test-glib-submenu-client.o `test -f 'test-glib-submenu-client.c' || echo '$(srcdir)/'`test-glib-submenu-client.c
+
+test_glib_submenu_client-test-glib-submenu-client.obj: test-glib-submenu-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -MT test_glib_submenu_client-test-glib-submenu-client.obj -MD -MP -MF $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo -c -o test_glib_submenu_client-test-glib-submenu-client.obj `if test -f 'test-glib-submenu-client.c'; then $(CYGPATH_W) 'test-glib-submenu-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Tpo $(DEPDIR)/test_glib_submenu_client-test-glib-submenu-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-client.c' object='test_glib_submenu_client-test-glib-submenu-client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_client_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_client-test-glib-submenu-client.obj `if test -f 'test-glib-submenu-client.c'; then $(CYGPATH_W) 'test-glib-submenu-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-client.c'; fi`
+
+test_glib_submenu_server-test-glib-submenu-server.o: test-glib-submenu-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -MT test_glib_submenu_server-test-glib-submenu-server.o -MD -MP -MF $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo -c -o test_glib_submenu_server-test-glib-submenu-server.o `test -f 'test-glib-submenu-server.c' || echo '$(srcdir)/'`test-glib-submenu-server.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-server.c' object='test_glib_submenu_server-test-glib-submenu-server.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_server-test-glib-submenu-server.o `test -f 'test-glib-submenu-server.c' || echo '$(srcdir)/'`test-glib-submenu-server.c
+
+test_glib_submenu_server-test-glib-submenu-server.obj: test-glib-submenu-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -MT test_glib_submenu_server-test-glib-submenu-server.obj -MD -MP -MF $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo -c -o test_glib_submenu_server-test-glib-submenu-server.obj `if test -f 'test-glib-submenu-server.c'; then $(CYGPATH_W) 'test-glib-submenu-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-server.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Tpo $(DEPDIR)/test_glib_submenu_server-test-glib-submenu-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-submenu-server.c' object='test_glib_submenu_server-test-glib-submenu-server.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_submenu_server_CFLAGS) $(CFLAGS) -c -o test_glib_submenu_server-test-glib-submenu-server.obj `if test -f 'test-glib-submenu-server.c'; then $(CYGPATH_W) 'test-glib-submenu-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-submenu-server.c'; fi`
+
 test_gtk_label_client-test-gtk-label-client.o: test-gtk-label-client.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_gtk_label_client_CFLAGS) $(CFLAGS) -MT test_gtk_label_client-test-gtk-label-client.o -MD -MP -MF $(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Tpo -c -o test_gtk_label_client-test-gtk-label-client.o `test -f 'test-gtk-label-client.c' || echo '$(srcdir)/'`test-gtk-label-client.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Tpo $(DEPDIR)/test_gtk_label_client-test-gtk-label-client.Po
@@ -1331,6 +1429,15 @@ test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@echo $(DBUS_RUNNER) --task ./test-glib-layout-client --task-name Client --task ./test-glib-layout-server --task-name Server --ignore-return >> $@
 	@chmod +x $@
 
+######################
+# Test Glib Submenu
+######################
+
+test-glib-submenu: test-glib-submenu-client test-glib-submenu-server Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(DBUS_RUNNER) --task ./test-glib-submenu-client --task-name Client --task ./test-glib-submenu-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
 test-glib-objects-test: test-glib-objects Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo $(DBUS_RUNNER) --task gtester --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
diff --git a/tests/test-glib-submenu-client.c b/tests/test-glib-submenu-client.c
new file mode 100644
index 0000000..57762cd
--- /dev/null
+++ b/tests/test-glib-submenu-client.c
@@ -0,0 +1,119 @@
+/*
+A test for libdbusmenu to ensure its quality.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <glib.h>
+
+#include <libdbusmenu-glib/client.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+#include "test-glib-submenu.h"
+
+static guint layouton = 0;
+static GMainLoop * mainloop = NULL;
+static gboolean passed = TRUE;
+
+static void
+realization (DbusmenuMenuitem * mi)
+{
+	const gchar * value;
+	gboolean original = passed;
+
+	value = dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY);
+
+	if (layouton % 2 == 0) {
+		if (value == NULL) {
+			passed = FALSE;
+		}
+	} else {
+		if (value != NULL) {
+			passed = FALSE;
+		}
+	}
+
+	if (original != passed) {
+		g_debug("Oops, this is where we failed");
+	}
+
+	return;
+}
+
+static void
+layout_updated (DbusmenuClient * client, gpointer data)
+{
+	g_debug("Layout Updated");
+
+	DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client);
+	if (menuroot == NULL) {
+		g_debug("Root is NULL?");
+		return;
+	}
+
+	GList * children = dbusmenu_menuitem_get_children(menuroot);
+	if (children == NULL) {
+		g_debug("No Children on root -- fail");
+		passed = FALSE;
+	} else {
+		for (; children != NULL; children = g_list_next(children)) {
+			g_signal_connect(G_OBJECT(children->data), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(realization), NULL);
+		}
+	}
+
+	layouton++;
+
+	if (layouts[layouton].id == -1) {
+		g_main_loop_quit(mainloop);
+	}
+
+	return;
+}
+
+static gboolean
+timer_func (gpointer data)
+{
+	g_debug("Death timer.  Oops.  Got to: %d", layouton);
+	passed = FALSE;
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	DbusmenuClient * client = dbusmenu_client_new("org.dbusmenu.test", "/org/test");
+	g_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED, G_CALLBACK(layout_updated), NULL);
+
+	g_timeout_add_seconds(10, timer_func, client);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_object_unref(G_OBJECT(client));
+
+	if (passed) {
+		g_debug("Quiting");
+		return 0;
+	} else {
+		g_debug("Quiting as we're a failure");
+		return 1;
+	}
+}
diff --git a/tests/test-glib-submenu-server.c b/tests/test-glib-submenu-server.c
new file mode 100644
index 0000000..68f7004
--- /dev/null
+++ b/tests/test-glib-submenu-server.c
@@ -0,0 +1,109 @@
+/*
+A test for libdbusmenu to ensure its quality.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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 <libdbusmenu-glib/server.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+#include "test-glib-submenu.h"
+
+
+static DbusmenuMenuitem *
+layout2menuitem (layout_t * layout)
+{
+	if (layout == NULL || layout->id == 0) return NULL;
+
+	DbusmenuMenuitem * local = dbusmenu_menuitem_new_with_id(layout->id);
+	
+	if (layout->submenu != NULL) {
+		guint count;
+		for (count = 0; layout->submenu[count].id != -1; count++) {
+			DbusmenuMenuitem * child = layout2menuitem(&layout->submenu[count]);
+			if (child != NULL) {
+				dbusmenu_menuitem_child_append(local, child);
+			}
+		}
+	}
+
+	/* g_debug("Layout to menu return: 0x%X", (unsigned int)local); */
+	return local;
+}
+
+static guint layouton = 0;
+static DbusmenuServer * server = NULL;
+static GMainLoop * mainloop = NULL;
+
+static gboolean
+timer_func (gpointer data)
+{
+	if (layouts[layouton].id == -1) {
+		g_main_loop_quit(mainloop);
+		return FALSE;
+	}
+	g_debug("Updating to Layout %d", layouton);
+
+	dbusmenu_server_set_root(server, layout2menuitem(&layouts[layouton]));
+	layouton++;
+
+	return TRUE;
+}
+
+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);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_debug("Quiting");
+
+	return 0;
+}
diff --git a/tests/test-glib-submenu.h b/tests/test-glib-submenu.h
new file mode 100644
index 0000000..f585d1b
--- /dev/null
+++ b/tests/test-glib-submenu.h
@@ -0,0 +1,54 @@
+/*
+A test for libdbusmenu to ensure its quality.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+typedef struct _layout_t layout_t;
+struct _layout_t {
+	gint id;
+	layout_t * submenu;
+};
+
+layout_t submenu_l2[] = {
+	{id: 6, submenu: NULL},
+	{id: 7, submenu: NULL},
+	{id: 8, submenu: NULL},
+	{id: -1, submenu: NULL}
+};
+
+layout_t submenu[] = {
+	{id: 2, submenu: submenu_l2},
+	{id: 3, submenu: submenu_l2},
+	{id: -1, submenu: NULL}
+};
+
+layout_t no_submenu[] = {
+	{id: 4, submenu: NULL},
+	{id: 5, submenu: NULL},
+	{id: -1, submenu: NULL}
+};
+
+layout_t layouts[] = {
+	{id: 1, submenu: no_submenu},
+	{id: 1, submenu: submenu},
+	{id: 1, submenu: no_submenu},
+	{id: 1, submenu: submenu},
+	{id: -1, submenu: NULL}
+};
+