* New upstream release.

  * Handling window grabs on activated signals (LP: #633275)
  * Fixing the passing of the value to the results signal
  * Adding a test for checking event results signal
  * Changing the timeouts on event calls for better detection
    of failing applications

4 files changed, 379 insertions, 6 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9f621cb..aa79c8f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,6 +5,7 @@ CLEANFILES=
 
 TESTS = \
 	test-glib-objects-test \
+	test-glib-events \
 	test-glib-layout \
 	test-glib-properties \
 	test-glib-proxy \
@@ -20,6 +21,8 @@ TESTS = \
 check_PROGRAMS = \
 	glib-server-nomenu \
 	test-glib-objects \
+	test-glib-events-client \
+	test-glib-events-server \
 	test-glib-layout-client \
 	test-glib-layout-server \
 	test-glib-properties-client \
@@ -129,6 +132,37 @@ test_glib_layout_client_LDADD = \
 	$(DBUSMENUGLIB_LIBS)
 
 ######################
+# Test Glib Events
+######################
+
+test-glib-events: test-glib-events-client test-glib-events-server Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(DBUS_RUNNER) --task ./test-glib-events-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
+test_glib_events_server_SOURCES = \
+	test-glib-events-server.c
+
+test_glib_events_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_events_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
+test_glib_events_client_SOURCES = \
+	test-glib-events-client.c
+
+test_glib_events_client_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_events_client_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
+######################
 # Test JSON
 ######################
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 33046c9..260cf3c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -36,13 +36,15 @@ PRE_UNINSTALL = :
 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-glib-submenu test-json test-gtk-objects-test \
-	test-gtk-label test-gtk-shortcut test-gtk-reorder \
-	test-gtk-submenu
+TESTS = test-glib-objects-test test-glib-events test-glib-layout \
+	test-glib-properties test-glib-proxy \
+	test-glib-simple-items$(EXEEXT) test-glib-submenu test-json \
+	test-gtk-objects-test test-gtk-label test-gtk-shortcut \
+	test-gtk-reorder test-gtk-submenu
 check_PROGRAMS = glib-server-nomenu$(EXEEXT) \
-	test-glib-objects$(EXEEXT) test-glib-layout-client$(EXEEXT) \
+	test-glib-objects$(EXEEXT) test-glib-events-client$(EXEEXT) \
+	test-glib-events-server$(EXEEXT) \
+	test-glib-layout-client$(EXEEXT) \
 	test-glib-layout-server$(EXEEXT) \
 	test-glib-properties-client$(EXEEXT) \
 	test-glib-properties-server$(EXEEXT) \
@@ -118,6 +120,26 @@ glib_server_nomenu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(glib_server_nomenu_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
+am_test_glib_events_client_OBJECTS =  \
+	test_glib_events_client-test-glib-events-client.$(OBJEXT)
+test_glib_events_client_OBJECTS =  \
+	$(am_test_glib_events_client_OBJECTS)
+test_glib_events_client_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
+test_glib_events_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_glib_events_client_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am_test_glib_events_server_OBJECTS =  \
+	test_glib_events_server-test-glib-events-server.$(OBJEXT)
+test_glib_events_server_OBJECTS =  \
+	$(am_test_glib_events_server_OBJECTS)
+test_glib_events_server_DEPENDENCIES =  \
+	../libdbusmenu-glib/libdbusmenu-glib.la $(am__DEPENDENCIES_1)
+test_glib_events_server_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(test_glib_events_server_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_test_glib_layout_client_OBJECTS =  \
 	test_glib_layout_client-test-glib-layout-client.$(OBJEXT)
 test_glib_layout_client_OBJECTS =  \
@@ -364,6 +386,8 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
 	$(glib_server_nomenu_SOURCES) \
+	$(test_glib_events_client_SOURCES) \
+	$(test_glib_events_server_SOURCES) \
 	$(test_glib_layout_client_SOURCES) \
 	$(test_glib_layout_server_SOURCES) \
 	$(test_glib_objects_SOURCES) \
@@ -385,6 +409,8 @@ SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
 	$(test_json_server_SOURCES)
 DIST_SOURCES = $(libdbusmenu_jsonloader_la_SOURCES) \
 	$(glib_server_nomenu_SOURCES) \
+	$(test_glib_events_client_SOURCES) \
+	$(test_glib_events_server_SOURCES) \
 	$(test_glib_layout_client_SOURCES) \
 	$(test_glib_layout_server_SOURCES) \
 	$(test_glib_objects_SOURCES) \
@@ -655,6 +681,28 @@ test_glib_layout_client_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+test_glib_events_server_SOURCES = \
+	test-glib-events-server.c
+
+test_glib_events_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_events_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
+test_glib_events_client_SOURCES = \
+	test-glib-events-client.c
+
+test_glib_events_client_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_glib_events_client_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	$(DBUSMENUGLIB_LIBS)
+
 test_json_server_SOURCES = \
 	test-json-server.c
 
@@ -1049,6 +1097,12 @@ clean-checkPROGRAMS:
 glib-server-nomenu$(EXEEXT): $(glib_server_nomenu_OBJECTS) $(glib_server_nomenu_DEPENDENCIES) 
 	@rm -f glib-server-nomenu$(EXEEXT)
 	$(AM_V_CCLD)$(glib_server_nomenu_LINK) $(glib_server_nomenu_OBJECTS) $(glib_server_nomenu_LDADD) $(LIBS)
+test-glib-events-client$(EXEEXT): $(test_glib_events_client_OBJECTS) $(test_glib_events_client_DEPENDENCIES) 
+	@rm -f test-glib-events-client$(EXEEXT)
+	$(AM_V_CCLD)$(test_glib_events_client_LINK) $(test_glib_events_client_OBJECTS) $(test_glib_events_client_LDADD) $(LIBS)
+test-glib-events-server$(EXEEXT): $(test_glib_events_server_OBJECTS) $(test_glib_events_server_DEPENDENCIES) 
+	@rm -f test-glib-events-server$(EXEEXT)
+	$(AM_V_CCLD)$(test_glib_events_server_LINK) $(test_glib_events_server_OBJECTS) $(test_glib_events_server_LDADD) $(LIBS)
 test-glib-layout-client$(EXEEXT): $(test_glib_layout_client_OBJECTS) $(test_glib_layout_client_DEPENDENCIES) 
 	@rm -f test-glib-layout-client$(EXEEXT)
 	$(AM_V_CCLD)$(test_glib_layout_client_LINK) $(test_glib_layout_client_OBJECTS) $(test_glib_layout_client_LDADD) $(LIBS)
@@ -1121,6 +1175,8 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib_server_nomenu-glib-server-nomenu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdbusmenu_jsonloader_la-json-loader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_events_client-test-glib-events-client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_events_server-test-glib-events-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_layout_server-test-glib-layout-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_glib_objects-test-glib-objects.Po@am__quote@
@@ -1191,6 +1247,38 @@ glib_server_nomenu-glib-server-nomenu.obj: glib-server-nomenu.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(glib_server_nomenu_CFLAGS) $(CFLAGS) -c -o glib_server_nomenu-glib-server-nomenu.obj `if test -f 'glib-server-nomenu.c'; then $(CYGPATH_W) 'glib-server-nomenu.c'; else $(CYGPATH_W) '$(srcdir)/glib-server-nomenu.c'; fi`
 
+test_glib_events_client-test-glib-events-client.o: test-glib-events-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_client_CFLAGS) $(CFLAGS) -MT test_glib_events_client-test-glib-events-client.o -MD -MP -MF $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo -c -o test_glib_events_client-test-glib-events-client.o `test -f 'test-glib-events-client.c' || echo '$(srcdir)/'`test-glib-events-client.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo $(DEPDIR)/test_glib_events_client-test-glib-events-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-events-client.c' object='test_glib_events_client-test-glib-events-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_events_client_CFLAGS) $(CFLAGS) -c -o test_glib_events_client-test-glib-events-client.o `test -f 'test-glib-events-client.c' || echo '$(srcdir)/'`test-glib-events-client.c
+
+test_glib_events_client-test-glib-events-client.obj: test-glib-events-client.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_client_CFLAGS) $(CFLAGS) -MT test_glib_events_client-test-glib-events-client.obj -MD -MP -MF $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo -c -o test_glib_events_client-test-glib-events-client.obj `if test -f 'test-glib-events-client.c'; then $(CYGPATH_W) 'test-glib-events-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-client.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_client-test-glib-events-client.Tpo $(DEPDIR)/test_glib_events_client-test-glib-events-client.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-events-client.c' object='test_glib_events_client-test-glib-events-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_events_client_CFLAGS) $(CFLAGS) -c -o test_glib_events_client-test-glib-events-client.obj `if test -f 'test-glib-events-client.c'; then $(CYGPATH_W) 'test-glib-events-client.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-client.c'; fi`
+
+test_glib_events_server-test-glib-events-server.o: test-glib-events-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_server_CFLAGS) $(CFLAGS) -MT test_glib_events_server-test-glib-events-server.o -MD -MP -MF $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo -c -o test_glib_events_server-test-glib-events-server.o `test -f 'test-glib-events-server.c' || echo '$(srcdir)/'`test-glib-events-server.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo $(DEPDIR)/test_glib_events_server-test-glib-events-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-events-server.c' object='test_glib_events_server-test-glib-events-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_events_server_CFLAGS) $(CFLAGS) -c -o test_glib_events_server-test-glib-events-server.o `test -f 'test-glib-events-server.c' || echo '$(srcdir)/'`test-glib-events-server.c
+
+test_glib_events_server-test-glib-events-server.obj: test-glib-events-server.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_events_server_CFLAGS) $(CFLAGS) -MT test_glib_events_server-test-glib-events-server.obj -MD -MP -MF $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo -c -o test_glib_events_server-test-glib-events-server.obj `if test -f 'test-glib-events-server.c'; then $(CYGPATH_W) 'test-glib-events-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-server.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_events_server-test-glib-events-server.Tpo $(DEPDIR)/test_glib_events_server-test-glib-events-server.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-glib-events-server.c' object='test_glib_events_server-test-glib-events-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_events_server_CFLAGS) $(CFLAGS) -c -o test_glib_events_server-test-glib-events-server.obj `if test -f 'test-glib-events-server.c'; then $(CYGPATH_W) 'test-glib-events-server.c'; else $(CYGPATH_W) '$(srcdir)/test-glib-events-server.c'; fi`
+
 test_glib_layout_client-test-glib-layout-client.o: test-glib-layout-client.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_glib_layout_client_CFLAGS) $(CFLAGS) -MT test_glib_layout_client-test-glib-layout-client.o -MD -MP -MF $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Tpo -c -o test_glib_layout_client-test-glib-layout-client.o `test -f 'test-glib-layout-client.c' || echo '$(srcdir)/'`test-glib-layout-client.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Tpo $(DEPDIR)/test_glib_layout_client-test-glib-layout-client.Po
@@ -1932,6 +2020,15 @@ test-glib-layout: test-glib-layout-client test-glib-layout-server Makefile.am
 	@chmod +x $@
 
 ######################
+# Test Glib Events
+######################
+
+test-glib-events: test-glib-events-client test-glib-events-server Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(DBUS_RUNNER) --task ./test-glib-events-client --task-name Client --task ./test-glib-events-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
+######################
 # Test JSON
 ######################
 
diff --git a/tests/test-glib-events-client.c b/tests/test-glib-events-client.c
new file mode 100644
index 0000000..97d5caf
--- /dev/null
+++ b/tests/test-glib-events-client.c
@@ -0,0 +1,140 @@
+/*
+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"
+
+#define TIMESTAMP_VALUE  54
+#define DATA_VALUE       32
+#define USER_VALUE       76
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = TRUE;
+static gboolean first = TRUE;
+
+static void
+event_status (DbusmenuClient * client, DbusmenuMenuitem * item, gchar * name, GValue * data, guint timestamp, GError * error, gpointer user_data)
+{
+	g_debug("Event status: %s", error == NULL ? "Sent" : "Error");
+
+	if (timestamp != TIMESTAMP_VALUE) {
+		g_debug("Timestamp value pass fail got: %d", timestamp);
+		passed = FALSE;
+		g_main_loop_quit(mainloop);
+		return;
+	}
+
+	if (g_value_get_int(data) != DATA_VALUE) {
+		g_debug("Data value pass fail got: %d", g_value_get_int(data));
+		passed = FALSE;
+		g_main_loop_quit(mainloop);
+		return;
+	}
+
+	if (GPOINTER_TO_INT(user_data) != USER_VALUE) {
+		g_debug("User value pass fail got: %d", GPOINTER_TO_INT(user_data));
+		passed = FALSE;
+		g_main_loop_quit(mainloop);
+		return;
+	}
+
+	if (first && error != NULL) {
+		passed = FALSE;
+		g_debug("First signal back failed.");
+		g_main_loop_quit(mainloop);
+		return;
+	}
+
+	if (!first && error == NULL) {
+		passed = FALSE;
+		g_debug("Second signal didn't fail.");
+		g_main_loop_quit(mainloop);
+		return;
+	}
+
+	if (!first && error != NULL) {
+		g_debug("Second signal failed: pass.");
+		g_main_loop_quit(mainloop);
+		return;
+	}
+
+	first = FALSE;
+	dbusmenu_menuitem_handle_event(item, "clicked", data, timestamp);
+	return;
+}
+
+static void
+layout_updated (DbusmenuClient * client, gpointer user_data)
+{
+	g_debug("Layout Updated");
+
+	DbusmenuMenuitem * menuroot = dbusmenu_client_get_root(client);
+	if (menuroot == NULL) {
+		g_debug("Root is NULL?");
+		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);
+
+	return;
+}
+
+static gboolean
+timer_func (gpointer data)
+{
+	g_debug("Death timer.  Oops.");
+	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_signal_connect(G_OBJECT(client), DBUSMENU_CLIENT_SIGNAL_EVENT_RESULT, G_CALLBACK(event_status), GINT_TO_POINTER(USER_VALUE));
+
+	g_timeout_add_seconds(5, 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-events-server.c b/tests/test-glib-events-server.c
new file mode 100644
index 0000000..0d1e0b1
--- /dev/null
+++ b/tests/test-glib-events-server.c
@@ -0,0 +1,102 @@
+/*
+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>
+
+static DbusmenuServer * server = NULL;
+static GMainLoop * mainloop = NULL;
+static gboolean passed = TRUE;
+
+static void
+handle_event (void) {
+	g_debug("Handle event");
+	g_main_loop_quit(mainloop);
+	return;
+}
+
+static gboolean
+timer_func (gpointer data)
+{
+	passed = FALSE;
+	g_debug("Never got a signal");
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+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");
+	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);
+
+	g_timeout_add_seconds(3, timer_func, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	if (passed) {
+		int i;
+
+		for (i = 0; i < 5; i++) {
+			g_debug("Ignoring signals: %d", i);
+			g_usleep(1000 * 1000);
+		}
+	}
+
+	if (passed) {
+		g_debug("Test Passed");
+		return 0;
+	} else {
+		g_debug("Test Failed");
+		return 1;
+	}
+}