aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/dbusmenu-dumper.c6
-rw-r--r--tools/testapp/Makefile.am6
2 files changed, 9 insertions, 3 deletions
diff --git a/tools/dbusmenu-dumper.c b/tools/dbusmenu-dumper.c
index bd986e8..2db437d 100644
--- a/tools/dbusmenu-dumper.c
+++ b/tools/dbusmenu-dumper.c
@@ -270,10 +270,12 @@ init_dbus_vars_from_window(Window window)
error = NULL;
GVariant * retval;
+ GVariant * args[1];
+ args[0] = g_variant_new("u", window);
retval = g_dbus_proxy_call_sync(proxy,
"GetMenuForWindow",
- g_variant_new("u", window),
+ g_variant_new_tuple(args, 1),
G_DBUS_CALL_FLAGS_NONE,
-1,
NULL,
@@ -285,7 +287,7 @@ init_dbus_vars_from_window(Window window)
return FALSE;
}
- g_variant_get(retval, "so", &dbusname, &dbusobject);
+ g_variant_get(retval, "(so)", &dbusname, &dbusobject);
g_variant_unref(retval);
g_object_unref(proxy);
diff --git a/tools/testapp/Makefile.am b/tools/testapp/Makefile.am
index f59f839..e2bbde7 100644
--- a/tools/testapp/Makefile.am
+++ b/tools/testapp/Makefile.am
@@ -1,5 +1,9 @@
-libexec_PROGRAMS = dbusmenu-testapp
+libexec_PROGRAMS =
+
+if WANT_TESTS
+libexec_PROGRAMS += dbusmenu-testapp
+endif
dbusmenu_testapp_SOURCES = \
main.c