ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/dbusmenu/event-status-signal into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)


Fixes the event status signal, builds a test for it, and adjusts the timeout to make it more responsive.
-- 
https://code.launchpad.net/~ted/dbusmenu/event-status-signal/+merge/33965
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file '.bzrignore'
--- .bzrignore	2010-08-18 01:42:22 +0000
+++ .bzrignore	2010-08-27 22:04:44 +0000
@@ -191,3 +191,6 @@
 libdbusmenu-glib/client-marshal.c
 libdbusmenu-glib/client-marshal.h
 libdbusmenu-glib/libdbusmenu_glib_la-client-marshal.lo
+tests/test-glib-events
+tests/test-glib-events-client
+tests/test-glib-events-server

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2010-08-26 19:45:26 +0000
+++ libdbusmenu-glib/client.c	2010-08-27 22:04:44 +0000
@@ -1058,10 +1058,10 @@
 	event_data_t * edata = (event_data_t *)userdata;
 
 	if (error != NULL) {
-		g_warning("Unable to call menu item %d: %s", GPOINTER_TO_INT(userdata), error->message);
+		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->data, edata->timestamp, error, TRUE);
 
 	g_value_unset(&edata->data);
 	g_free(edata->event);
@@ -1103,7 +1103,12 @@
 	g_value_copy(value, &edata->data);
 	edata->timestamp = timestamp;
 
-	org_ayatana_dbusmenu_event_async (priv->menuproxy, id, name, value, timestamp, menuitem_call_cb, edata);
+	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);
+
 	return;
 }
 

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-08-05 17:34:18 +0000
+++ tests/Makefile.am	2010-08-27 22:04:44 +0000
@@ -5,6 +5,7 @@
 
 TESTS = \
 	test-glib-objects-test \
+	test-glib-events \
 	test-glib-layout \
 	test-glib-properties \
 	test-glib-proxy \
@@ -20,6 +21,8 @@
 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 @@
 	$(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
 ######################
 

=== added file 'tests/test-glib-events-client.c'
--- tests/test-glib-events-client.c	1970-01-01 00:00:00 +0000
+++ tests/test-glib-events-client.c	2010-08-27 22:04:44 +0000
@@ -0,0 +1,140 @@
+/*
+A test for libdbusmenu to ensure its quality.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@xxxxxxxxxxxxx>
+
+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;
+	}
+}

=== added file 'tests/test-glib-events-server.c'
--- tests/test-glib-events-server.c	1970-01-01 00:00:00 +0000
+++ tests/test-glib-events-server.c	2010-08-27 22:04:44 +0000
@@ -0,0 +1,102 @@
+/*
+A test for libdbusmenu to ensure its quality.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@xxxxxxxxxxxxx>
+
+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;
+	}
+}