diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-17 11:06:09 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-17 11:06:09 -0600 |
| commit | 7dff7bf5303c1040c4dd7ae2a4920837142b4a94 (patch) | |
| tree | e12aca4ae86a0ddadc0d12437f89dc14e1c185bd /tools | |
| parent | ad89e1475b57b20cc97472b0a7e399beed4dd562 (diff) | |
| parent | 44927e6da03d633f0958ce5e04e62e752a43d201 (diff) | |
| download | libdbusmenu-7dff7bf5303c1040c4dd7ae2a4920837142b4a94.tar.gz libdbusmenu-7dff7bf5303c1040c4dd7ae2a4920837142b4a94.tar.bz2 libdbusmenu-7dff7bf5303c1040c4dd7ae2a4920837142b4a94.zip | |
New upstream release.
∘ Fixing distcheck
∘ Grouping Property Change events into a single DBus signal
∘ Removing XML from the GetLayout function
∘ Clean up icon handling in the parser (LP: #715864)
∘ Fixing signatures on dbusmenu-dumper
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 7 | ||||
| -rw-r--r-- | tools/dbusmenu-dumper.c | 6 | ||||
| -rw-r--r-- | tools/testapp/Makefile.in | 7 |
3 files changed, 16 insertions, 4 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index b8192f6..7d48bd7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -40,7 +40,12 @@ libexec_PROGRAMS = dbusmenu-dumper$(EXEEXT) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs 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.in b/tools/testapp/Makefile.in index c994d5b..387c6bb 100644 --- a/tools/testapp/Makefile.in +++ b/tools/testapp/Makefile.in @@ -38,7 +38,12 @@ libexec_PROGRAMS = dbusmenu-testapp$(EXEEXT) subdir = tools/testapp DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ + $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |