From bba2d0aecb9ac87a822f343cad0f55002ed96dd6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 10 Oct 2009 16:43:33 -0400 Subject: Adding in basic xvfb stuff, doesn't quite work. --- tests/Makefile.am | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 10fe857..833c3fc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,6 @@ DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf TESTS = \ - test-mago \ test-glib-layout \ test-glib-properties \ test-gtk-label \ @@ -20,6 +19,33 @@ check_PROGRAMS = \ test-glib-simple-items \ test-gtk-reorder-server +check-local: test-mago-xvfb + +###################### +# Xvfb server stuff +###################### + +XVFB = Xvfb -ac -noreset -screen 0 800x600x16 +XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \ + 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \ + 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \ + 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \ + 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \ + 9995 9996 9997 9998 9999 +XVFB_START = \ + ${XVFB} -help 2>/dev/null 1>&2 \ + && XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \ + && { ${XVFB} :$$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \ + trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \ + || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \ + && DISPLAY=:$$XID && export DISPLAY +# call as: $(XVFB_START) && someprogram + + +###################### +# Test GLib server +###################### + glib_server_nomenu_SOURCES = \ glib-server-nomenu.c @@ -180,6 +206,9 @@ test_gtk_reorder_server_LDADD = \ # Test Mago ######################### +test-mago-xvfb: test-mago + $(XVFB_START) && ./test-mago + test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/mago_tests/dbusmenu.xml Makefile.am @echo "#!/bin/sh" > test-mago @echo cd $(srcdir)/dbusmenu-gtk >> test-mago -- cgit v1.2.3 From 2e8bdc835c50f84782f4c32fc4a947444848ffaf Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Oct 2009 11:55:50 -0500 Subject: First step, change the interface name. --- libdbusmenu-glib/dbus-menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml index cca9823..2a68ddd 100644 --- a/libdbusmenu-glib/dbus-menu.xml +++ b/libdbusmenu-glib/dbus-menu.xml @@ -28,7 +28,7 @@ License version 3 and version 2.1 along with this program. If not, see --> - + -- cgit v1.2.3 From 3615a9e9406d6bee823e323fef0e2193a9ce4e3c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Oct 2009 11:57:04 -0500 Subject: Changing the function calls to match the change. --- libdbusmenu-glib/client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index ab307bd..349ae73 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -351,7 +351,7 @@ id_update (DBusGProxy * proxy, guint id, DbusmenuClient * client) DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id); g_return_if_fail(menuitem != NULL); - org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem); + org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem); return; } @@ -647,7 +647,7 @@ static void menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client) { DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); - org_freedesktop_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi); + org_ayatana_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi); return; } @@ -689,7 +689,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it propdata->item = item; propdata->parent = parent; - org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata); + org_ayatana_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata); } else { g_warning("Unable to allocate memory to get properties for menuitem. This menuitem will never be realized."); } -- cgit v1.2.3 From 7c5ed374e35a958c50ad74e26bb6df6f8e9e0c7c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Oct 2009 11:58:24 -0500 Subject: Chaning the default object path. --- libdbusmenu-glib/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 1ac1da6..84bfffe 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -161,7 +161,7 @@ dbusmenu_server_class_init (DbusmenuServerClass *class) g_object_class_install_property (object_class, PROP_DBUS_OBJECT, g_param_spec_string(DBUSMENU_SERVER_PROP_DBUS_OBJECT, "DBus object path", "The object that represents this set of menus on DBus", - "/org/freedesktop/dbusmenu", + "/org/ayatana/dbusmenu", G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (object_class, PROP_ROOT_NODE, g_param_spec_object(DBUSMENU_SERVER_PROP_ROOT_NODE, "Root menu node", @@ -472,7 +472,7 @@ _dbusmenu_server_call (DbusmenuServer * server, guint id, GError ** error) Creates a new #DbusmenuServer object with a specific object path on DBus. If @object is set to NULL the default object - name of "/org/freedesktop/dbusmenu" will be used. + name of "/org/ayatana/dbusmenu" will be used. Return value: A brand new #DbusmenuServer */ @@ -480,7 +480,7 @@ DbusmenuServer * dbusmenu_server_new (const gchar * object) { if (object == NULL) { - object = "/org/freedesktop/dbusmenu"; + object = "/org/ayatana/dbusmenu"; } DbusmenuServer * self = g_object_new(DBUSMENU_TYPE_SERVER, -- cgit v1.2.3 From ae17afafe8ab3282e597542195595dffbe5fed99 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Oct 2009 11:58:38 -0500 Subject: Changing the interface name for properties. --- libdbusmenu-glib/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 349ae73..61f1ccf 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -472,7 +472,7 @@ build_proxies (DbusmenuClient * client) priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus, priv->dbus_name, priv->dbus_object, - "org.freedesktop.dbusmenu", + "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); @@ -829,7 +829,7 @@ update_layout (DbusmenuClient * client) update_layout_cb, client, NULL, - G_TYPE_STRING, "org.freedesktop.dbusmenu", + G_TYPE_STRING, "org.ayatana.dbusmenu", G_TYPE_STRING, "layout", G_TYPE_INVALID, G_TYPE_VALUE, G_TYPE_INVALID); -- cgit v1.2.3 From d3d19b7180357ddd33ff77a94cbf228681f650e4 Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Fri, 13 Nov 2009 14:33:30 -0600 Subject: New DBus menu API --- libdbusmenu-glib/dbus-menu.xml | 140 +++++++++++++++++++++++++++-------------- 1 file changed, 92 insertions(+), 48 deletions(-) diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml index c22d477..6f5bdb2 100644 --- a/libdbusmenu-glib/dbus-menu.xml +++ b/libdbusmenu-glib/dbus-menu.xml @@ -30,91 +30,135 @@ License version 3 and version 2.1 along with this program. If not, see - - - - + + + + + + + - - + + + - + + - + + + - + + + + + + + + + + + - + + + - - + + -- cgit v1.2.3 From 43e54b6b9331c4b626cac1a4929a93f4fcf5af87 Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Fri, 13 Nov 2009 15:20:08 -0600 Subject: Removed ItemAdded/ItemRemoved for now --- libdbusmenu-glib/dbus-menu.xml | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml index 6f5bdb2..7433ba2 100644 --- a/libdbusmenu-glib/dbus-menu.xml +++ b/libdbusmenu-glib/dbus-menu.xml @@ -138,29 +138,6 @@ for item @a id. - - - - - - - - - - - - -- cgit v1.2.3 From 8145a3f756f116b4be480e2a75a782e5c237dd15 Mon Sep 17 00:00:00 2001 From: Aurelien Gateau Date: Fri, 13 Nov 2009 15:24:01 -0600 Subject: Fixed type of value param in ItemPropertyUpdated() signal --- libdbusmenu-glib/dbus-menu.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-glib/dbus-menu.xml b/libdbusmenu-glib/dbus-menu.xml index 7433ba2..bd2d7e5 100644 --- a/libdbusmenu-glib/dbus-menu.xml +++ b/libdbusmenu-glib/dbus-menu.xml @@ -119,7 +119,7 @@ from item @a id has changed to @a value. - + + + + + + + + + + + - - + + - + @@ -131,11 +169,16 @@ Triggered by the application to notify the applet that all properties of item - - + + + -- cgit v1.2.3