--- libdbusmenu-0.3.98.orig/debian/gir1.2-dbusmenu-glib-0.4.debhelper.log +++ libdbusmenu-0.3.98/debian/gir1.2-dbusmenu-glib-0.4.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-glib3.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-glib3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-glib.so.* --- libdbusmenu-0.3.98.orig/debian/gir1.2-dbusmenu-gtk-0.4.install +++ libdbusmenu-0.3.98/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-glib-doc.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-glib-doc.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk-dev.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-gtk/* +debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc +debian/tmp/usr/lib/libdbusmenu-gtk.a +debian/tmp/usr/lib/libdbusmenu-gtk.so +debian/tmp/usr/share/gir-1.0/DbusmenuGtk-0.4.gir +debian/tmp/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk3-3.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk3-3.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/gir1.2-dbusmenu-gtk-0.4.debhelper.log +++ libdbusmenu-0.3.98/debian/gir1.2-dbusmenu-gtk-0.4.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/gir1.2-dbusmenu-glib-0.4.install +++ libdbusmenu-0.3.98/debian/gir1.2-dbusmenu-glib-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk3.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk3.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/debhelper.log +++ libdbusmenu-0.3.98/debian/debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk3-dev.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk3-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc +debian/tmp/usr/lib/libdbusmenu-gtk3.a +debian/tmp/usr/lib/libdbusmenu-gtk3.so +debian/tmp/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir +debian/tmp/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-tools.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-tools.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-tools.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-tools.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libdbusmenu/dbusmenu-* +debian/tmp/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ +debian/tmp/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk-doc.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk-doc.install @@ -0,0 +1 @@ +debian/tmp//usr/share/gtk-doc/html/libdbusmenu-gtk/* --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-glib-dev.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-glib-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-jsonloader-dev.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-jsonloader-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/copyright +++ libdbusmenu-0.3.98/debian/copyright @@ -0,0 +1,40 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libdbusmenu +Maintainer: Ted Gould +Source: https://launchpad.net/dbusmenu + +Files: * +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 + +Files: libdbusmenu-{glib,gtk}/* +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: LGPL-2.1 | LGPL-3 + +Files: libdbusmenu-glib/dbus-menu.xml +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Copyright: 2009-2010 Aurélien Gâteau +License: LGPL-2.1 | LGPL-3 + +Files: tools/{dbusmenu-bench,testapp/main.c} +Copyright: 2009-2010 Aurélien Gâteau +License: LGPL-2.1 | LGPL-3 + +Files: debian/* +Copyright: 2009-2010 Evgeni Golov +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Copyright: 2009-2010 Sebastien Bacher +Copyright: 2009-2010 Ken VanDine +License: GPL-3 + +License: GPL-3 + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +License: LGPL-2.1 + On Debian systems, the complete text of the GNU Lesser General + Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-3 + On Debian systems, the complete text of the GNU Lesser General + Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'. --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-jsonloader-dev.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-jsonloader-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader/* +debian/tmp/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc +debian/tmp/usr/lib/libdbusmenu-jsonloader.a +debian/tmp/usr/lib/libdbusmenu-jsonloader.so --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk3.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk.so.* --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-glib-dev.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-glib-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/* +debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc +debian/tmp/usr/lib/libdbusmenu-glib.a +debian/tmp/usr/lib/libdbusmenu-glib.so +debian/tmp/usr/share/gir-1.0/Dbusmenu-0.4.gir +debian/tmp/usr/share/vala/vapi/Dbusmenu-0.4.vapi --- libdbusmenu-0.3.98.orig/debian/control +++ libdbusmenu-0.3.98/debian/control @@ -0,0 +1,224 @@ +Source: libdbusmenu +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: The Ayatana Packagers +Uploaders: Evgeni Golov +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), + libgtk2.0-dev (>= 2.23.2-0ubuntu2), + libgtk-3-dev (>= 2.99.2-1ubuntu2), + libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), + libdbus-glib-1-dev, + gnome-doc-utils, + gtk-doc-tools, + libtool, + intltool, + libjson-glib-dev, + gobject-introspection, + libgirepository1.0-dev (>= 0.9.3), + gir1.2-glib-2.0, + gir1.2-gtk-2.0, + gir1.2-gtk-3.0, + libx11-dev (>= 1.3), + dh-autoreconf, + valac-0.12 +Standards-Version: 3.9.1 +Homepage: https://launchpad.net/dbusmenu +Vcs-Bzr: https://code.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~dbusmenu-team/dbusmenu/ubuntu + +Package: libdbusmenu-glib3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Breaks: indicator-messages (<< 0.3.0), + indicator-session (<< 0.2.0), + libdbusmenu-glib0 +Description: library for passing menus over DBus + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by applications. + +Package: libdbusmenu-glib-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-glib3 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0) +Description: library for passing menus over DBus - development files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build applications. + +Package: libdbusmenu-gtk3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: library for passing menus over DBus - GTK+ version + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by GTK+ applications. + +Package: libdbusmenu-gtk-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-gtk3 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0), + libdbusmenu-glib-dev +Description: library for passing menus over DBus - GTK+ version developement files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build GTK+ applications. + +Package: libdbusmenu-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + python, + libdbusmenu-glib3 (= ${binary:Version}) +Description: tools useful during development with libdbusmenu + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains tools that are useful when developing and building + applications with libdbusmenu. + +Package: gir1.2-dbusmenu-glib-0.4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + libdbusmenu-glib3 (= ${binary:Version}), + ${gir:Depends} +Description: typelib file for libdbusmenu-glib3 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-glib3. + +Package: gir1.2-dbusmenu-gtk-0.4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + libdbusmenu-gtk3 (= ${binary:Version}), + ${gir:Depends} +Description: typelib file for libdbusmenu-gtk3 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-gtk3. + +Package: libdbusmenu-glib-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: library for passing menus over DBus - documentation + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains developer documentation for libdbusmenu-glib. + +Package: libdbusmenu-gtk-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: library for passing menus over DBus - GTK+ version documentation + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains developer documentation for libdbusmenu-gtk. + +Package: libdbusmenu-jsonloader3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: library for passing menus over DBus - Test lib + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by test suites in + applications or libraries using dbusmenu. + +Package: libdbusmenu-jsonloader-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbus-glib-1-dev (>= 0.76), + libdbusmenu-glib-dev (= ${binary:Version}), + libjson-glib-dev +Description: library for passing menus over DBus - Test lib development files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build test suites in + applications or libraries using dbusmenu. + +Package: libdbusmenu-gtk3-3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: library for passing menus over DBus - GTK+ version + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by GTK+ applications. + +Package: libdbusmenu-gtk3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-gtk3-3 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk-3-dev (>= 2.91.4-0ubuntu1), + libdbusmenu-glib-dev +Description: library for passing menus over DBus - GTK+ version developement files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build GTK+ applications. + +Package: gir1.2-dbusmenu-gtk3-0.4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + libdbusmenu-gtk3-3 (= ${binary:Version}), + ${gir:Depends} +Description: typelib file for libdbusmenu-gtk3-3 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-gtk3. + --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk-doc.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk-doc.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/gir1.2-dbusmenu-gtk3-0.4.install +++ libdbusmenu-0.3.98/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib --- libdbusmenu-0.3.98.orig/debian/watch +++ libdbusmenu-0.3.98/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/dbusmenu/+download .*/libdbusmenu-([0-9.]+)\.tar\.gz --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk-dev.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-glib-doc.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-glib-doc.install @@ -0,0 +1 @@ +debian/tmp//usr/share/gtk-doc/html/libdbusmenu-glib/* --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-jsonloader3.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-jsonloader3.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-jsonloader3.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-jsonloader3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-jsonloader.so.* --- libdbusmenu-0.3.98.orig/debian/gir1.2-dbusmenu-gtk3-0.4.debhelper.log +++ libdbusmenu-0.3.98/debian/gir1.2-dbusmenu-gtk3-0.4.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk3-3.install +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk3-3.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbusmenu-gtk3.so.* --- libdbusmenu-0.3.98.orig/debian/rules +++ libdbusmenu-0.3.98/debian/rules @@ -0,0 +1,45 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk + +DEB_SRCDIR = . +DEB_BUILDDIR = $(DEB_SRCDIR)/build + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk2 += -V 'libdbusmenu-gtk2 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-gtk3-2 += -V 'libdbusmenu-gtk3-2 (>= 0.3.90)' +DEB_DH_MAKESHLIBS_ARGS_libdbusmenu-glib2 += -V 'libdbusmenu-glib2 (>= 0.3.90)' + +configure/libdbusmenu-gtk3-2:: stamp-configure-gtk3 +stamp-configure-gtk3: + : # configure for GTK+ 3.0 + set -e; \ + rm -rf build-gtk3; \ + mkdir build-gtk3; \ + cd build-gtk3; \ + $(DEB_CONFIGURE_SCRIPT_ENV) ../configure --with-gtk=3 \ + $(filter-out --srcdir=%, $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)) \ + --enable-gtk-doc=no; \ + cd ..; + touch stamp-configure-gtk3 + +build/libdbusmenu-gtk3-2:: stamp-build-gtk3 +stamp-build-gtk3: stamp-configure-gtk3 + : # build for GTK+ 3.0 + $(MAKE) -C build-gtk3; + touch stamp-build-gtk3 + +common-install-prehook-arch:: stamp-build-gtk3 + : # install for GTK+ 3.0 + $(MAKE) -C build-gtk3 DESTDIR=$(CURDIR)/debian/tmp install + +binary-predeb/gir%:: + dh_girepository -p$(cdbs_curpkg) + +clean:: + rm -f stamp-*-gtk3 + rm -rf build-gtk3 --- libdbusmenu-0.3.98.orig/debian/libdbusmenu-gtk3-dev.debhelper.log +++ libdbusmenu-0.3.98/debian/libdbusmenu-gtk3-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- libdbusmenu-0.3.98.orig/debian/changelog +++ libdbusmenu-0.3.98/debian/changelog @@ -0,0 +1,732 @@ +libdbusmenu (0.3.98-0ubuntu3) natty; urgency=low + + * debian/control: + - Use new libgtk-3-dev build-depends + + -- Robert Ancell Tue, 22 Feb 2011 16:16:44 +1100 + +libdbusmenu (0.3.98-0ubuntu2) natty; urgency=low + + * libdbusmenu-glib/{client,menuitem,server}.c + * Be more selective on unref + + -- Ken VanDine Tue, 22 Feb 2011 09:23:38 -0500 + +libdbusmenu (0.3.98-0ubuntu1) natty; urgency=low + + * 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 + * debian/control: Removing libxml2 Build-Dep + + -- Ted Gould Thu, 17 Feb 2011 11:11:40 -0600 + +libdbusmenu (0.3.97-0ubuntu1) natty; urgency=low + + [Ted Gould] + * New upstream release. + ∘ Handle ChildAdded on GtkShell items (LP: #709839) + ∘ Fixing take_children() to not unref + ∘ Fix naming of the GIR file (LP: #713099) + + [Ken VanDine] + * debian/gir1.2-dbusmenu-glib-0.4.install, + debian/libdbusmenu-glib-dev.install: Changing gir, typelib and vala + file names + + -- Ted Gould Thu, 10 Feb 2011 14:40:14 -0600 + +libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low + + * libdbusmenu-gtk/parser.c + - Handle ChildAdded on GtkShell items and clean up the code so that it + has single functions for doing common operations. (LP: #709839) + + -- Ken VanDine Mon, 07 Feb 2011 09:29:09 -0500 + +libdbusmenu (0.3.96-0ubuntu2) natty; urgency=low + + * libdbusmenu-glib/menuitem.c + - take_children() shouldn't unref as the caller wouldn't get a chance + to use the items if this was the last ref. + + -- Ken VanDine Fri, 04 Feb 2011 12:18:13 -0500 + +libdbusmenu (0.3.96-0ubuntu1) natty; urgency=low + + * New upstream release. + * Remove signal handlers for correct objects + + -- Ted Gould Thu, 03 Feb 2011 14:11:16 -0600 + +libdbusmenu (0.3.95-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fix crashes on rapidly creating and destroying client + and menu objects (LP: #709754) + * Fix dynamically changed submenus to get the parsed + (LP: #696896) + * Fix bad signature on GetProperties with no hits + + -- Ted Gould Mon, 31 Jan 2011 16:03:06 -0600 + +libdbusmenu (0.3.94-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fixing setting toggle to a boolean + * Fixing some memory leaks + * Fixing signatures in GetChildren + * Look for the serializable menuitems and use their + build functions + * Fix critical message from being printed + * Fixing shutdown messages on destruction + * Fixing warnings from 'use-fallback' + * Adding a parser + * Adding a serializable menu item + + -- Ted Gould Thu, 27 Jan 2011 14:26:19 -0600 + +libdbusmenu (0.3.93-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * New upstream release. + * Fixing scanner export + * Increasing scanner warnings + * Signalling to DBus when object is registered + * Handling errors in GVariant better than crashing + + [ Ken VanDine ] + * debian/control + - Bumped build depends for libgtk3.0-dev to >= 2.99.2-1ubuntu2, a gir + related patch we needed was dropped in 2.99.2-1ubuntu1 but re-added + in 2.99.2-1ubuntu2 + + -- Ken VanDine Thu, 20 Jan 2011 15:05:52 -0500 + +libdbusmenu (0.3.92-0ubuntu3) natty; urgency=low + + * libdbusmenu-glib/server.c + * Better error handling when parsing g_variants (LP: #703039) + + -- Ken VanDine Tue, 18 Jan 2011 12:19:37 -0500 + +libdbusmenu (0.3.92-0ubuntu2) natty; urgency=low + + * libdbusmenu-glib/Makefile.am, libdbusmenu-gtk/Makefile.am + - Use EXPORT_PACKAGES to prevent circular build depends + + -- Ken VanDine Tue, 18 Jan 2011 10:05:15 -0500 + +libdbusmenu (0.3.92-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fixing handle event to send unboxed values + * Build fixes + + -- Ted Gould Fri, 14 Jan 2011 10:43:44 -0600 + +libdbusmenu (0.3.91-0ubuntu1) natty; urgency=low + + * New upstream release. + * Porting from dbus-glib to GDBus + * Bumping the library ABI version + * debian/*.install: Changing to be the 0.4 version of the dbusmenu + API of all the filenames and paths. + * debian/control: Bumping ABI version in package names + * debian/control: Changing the GIR package names from "0.2" to + "0.4" which now the names of the actual files. + + -- Ted Gould Thu, 13 Jan 2011 10:24:28 -0600 + +libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low + + * Updated for the gir abi transition + + -- Ken VanDine Thu, 16 Dec 2010 10:06:26 -0500 + +libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low + + * libdbusmenu-gtk/genericmenuitem.c + - Switching away from using set_activate as that doesn't actually set + the value, it just signals + + -- Ken VanDine Thu, 09 Dec 2010 17:46:41 -0500 + +libdbusmenu (0.3.90-0ubuntu1) natty; urgency=low + + * debian/rules + - Added build targets to build with gtk3 enabled in additional to + default build with gtk2 + * debian/control + - Updated build depends to support building with gtk+-3.0 + - Added dh-autoreconf build depends + - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2 + binaries + - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed + for GIR fixes + - Removed build depends for gir-repository-dev (LP: #677382) + - Use gir:Depends + * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, + libdbusmenu-gtk/Makefile.am + - Fixes needed for building with-gtk=3 + + [ Ted Gould ] + * New upstream release. + * Breaking ABI and getting reserved back + * Adding build support for GTK2/3 builds + * Only force a flush of top level items, allow others to be + based on the count. + * debian/control, debian/libdbusmenu-glib2.install, + debian/libdbusmenu-gtk2.install: Switching package names to + match .so bump. + + -- Ken VanDine Wed, 24 Nov 2010 12:05:39 -0500 + +libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low + + * New upstream release: + * Don't use a typedef in the signal handler in the class to + avoid confusing vapigen. + + -- Ted Gould Wed, 22 Sep 2010 10:28:01 -0500 + +libdbusmenu (0.3.15-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release: + - fix Action for top-level dropdown menu item not activated (LP: #637692) + + -- Didier Roche Wed, 22 Sep 2010 14:55:44 +0200 + +libdbusmenu (0.3.14-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fixing a memory leak by unref'ing a hashtable + * Making a callback for the event dbus function happen off + of the mainloop so it returns a response. (LP: #636756) + + -- Ted Gould Wed, 15 Sep 2010 11:36:09 -0500 + +libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low + + * 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 + + [Ken VanDine] + * debian/control + - Dropped build depends for dbus-test-runner, it isn't in the archive + yet, we should add that next cycle + + -- Ted Gould Thu, 09 Sep 2010 09:50:15 -0500 + +libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low + + * debian/rules: update the shlibs + + [ Ted Gould ] + * New upstream release. + * Support activation of menus client side + * Increase layout XML size (LP: #621238) + * Display an event for the status of the signal to the server + + -- Sebastien Bacher Thu, 26 Aug 2010 23:34:45 +0200 + +libdbusmenu (0.3.11-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fix to handle whitespace in layout XML better + * Fixes to test scripts on ARM + + -- Ted Gould Thu, 19 Aug 2010 13:47:33 -0500 + +libdbusmenu (0.3.10-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fixes to dbusmenu-dumper + + -- Ted Gould Thu, 12 Aug 2010 11:28:37 -0500 + +libdbusmenu (0.3.9-0ubuntu2) maverick; urgency=low + + * Rebuild with the current gobject introspection version + + -- Sebastien Bacher Tue, 10 Aug 2010 21:50:16 +0200 + +libdbusmenu (0.3.9-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Making it so that properties are requested bredth first + * Globbing layout signaling from the server + * Globbing property requests into group requests (LP: #604670) + + -- Ted Gould Mon, 02 Aug 2010 20:28:58 -0500 + +libdbusmenu (0.3.8-0ubuntu1) maverick; urgency=low + + * New upstream release. + - Added ItemActivationRequested signal. + + -- Ken VanDine Fri, 30 Jul 2010 13:44:34 -0400 + +libdbusmenu (0.3.7-1) unstable; urgency=low + + * Merge latest upstream from Ubuntu. + * Standards-Version: 3.9.1 + + -- Evgeni Golov Thu, 29 Jul 2010 12:00:04 +0200 + +libdbusmenu (0.3.7-0ubuntu1) maverick; urgency=low + + * New upstream release. + + -- Ken VanDine Thu, 22 Jul 2010 21:17:13 +0200 + +libdbusmenu (0.3.6-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + + -- Evgeni Golov Sat, 17 Jul 2010 10:47:35 +0200 + +libdbusmenu (0.3.6-0ubuntu2~ppa1) lucid; urgency=low + + * Upstream Merge + * Making dbusmenu-dumper have a click to dump feature. + * Autogen update + + -- Ted Gould Tue, 20 Jul 2010 16:40:29 -0500 + +libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low + + * New upstream release. + ∘ Protect against NULL values as event + + -- Ted Gould Thu, 15 Jul 2010 09:42:07 -0500 + +libdbusmenu (0.3.5-1) unstable; urgency=low + + * Merge new upstream and changes from Ubuntu. + * debian/control: + + Add missing "used" to the json package description. + + -- Evgeni Golov Wed, 14 Jul 2010 10:21:29 +0200 + +libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low + + * New upstream release. + ∘ Protect against NULL nodes (LP: #602444) + ∘ Remove extra warnings and messages + ∘ Handle not having a session bus better (LP: #598715) + + -- Ted Gould Thu, 08 Jul 2010 10:24:18 -0500 + +libdbusmenu (0.3.4-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Block building submenus on separators (LP: #598620) + * Adding more through JSON support for testing + * Fixing up value handling in dbusmenu-dumper + * debian/control, debian/libdbusmenu-jsonloader*install: Adding + two binary packages for the jsonloader test library. + + -- Ted Gould Thu, 01 Jul 2010 09:00:16 -0500 + +libdbusmenu (0.3.3-1) unstable; urgency=low + + * Merge Ubuntu. + Preserve Maintainer and Vcs-* fields. + * Standards-Version: 3.9.0 + * Source-Format: 1.0 for now + + -- Evgeni Golov Thu, 01 Jul 2010 11:42:23 +0200 + +libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Adding support for menu shortcuts (LP: #591293) + * Fixing distcheck of documentation builds + * Autogen.sh fix for adding custom prefix (LP: #595565) + * Fixing children property name to match spec (LP: #597321) + * Merging in Debian branch + * debian/control: Switching branch on this branch to be the + dbusmenu-team. + * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions + + -- Ted Gould Thu, 24 Jun 2010 09:32:42 -0500 + +libdbusmenu (0.3.2-1) unstable; urgency=low + + * Merge from Ubuntu. + Closes: #586069 + * debian/control: + - Set Maintainer to pkg-ayatana. + - Add myself as Uploader. + - Update package descriptions. + - Standards-Version: 3.8.4 + - Fix Homepage URL. + - Update Vcs-* fields. + - -doc packages are Arch:all + * debian/copyright: + - Convert to DEP5 format. + - Add Ken and Sebastien, according to changelog. + - Add Aurélien Gâteau, according to headers. + + -- Evgeni Golov Sun, 20 Jun 2010 13:56:00 +0200 + +libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low + + * debian/control + - added doc packages + - added build dep for gtk-doc-tools + * debian/libdbusmenu-glib-doc.install added + * debian/libdbusmenu-gtk-doc.install added + * debian/rules + - enabled gtk-doc for configure + + [Ted Gould] + * New upstream release. + * Set the 'child-display' property on menuitems that + have child menuitems. + * gtk-doc support + * Document the 'shortcut' property + + -- Ken VanDine Thu, 10 Jun 2010 16:33:42 -0400 + +libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fix annotations for GIR scanner + * Add function to get submenu of GTK-ified items + * Fix signal prototype of ID update + * Fixing up VAPI files to build them correctly + * Fixing the version string in the GIR file + * Fix documentation title page + * Reject text nodes early (warnings with Qt integration) + * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file + names for package list. + * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the + typelib file. + + -- Ted Gould Fri, 04 Jun 2010 14:42:26 -0500 + +libdbusmenu (0.3.0-0ubuntu1~ppa1) lucid; urgency=low + + * New upstream release. + * Add function to get submenu of GTK-ified items + * Fix signal prototype of ID update + * Fixing up VAPI files to build them correctly + * Fixing the version string in the GIR file + * Fix documentation title page + * Reject text nodes early (warnings with Qt integration) + * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file + names for package list. + * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the + typelib file. + + -- Ted Gould Thu, 27 May 2010 11:47:05 -0500 + +libdbusmenu (0.2.9-0ubuntu3) lucid; urgency=low + + * Upstream Merge + * Only unref root if the root has changed. + * Ensure that callbacks retain references to objects incase + they get deleted quickly. + * Protecting references before signalling + * Decrementing refs when added to child menus + + -- Ted Gould Sat, 17 Apr 2010 13:09:57 -0500 + +libdbusmenu (0.2.9-0ubuntu2) lucid; urgency=low + + * Upstream Merge + * Changing GTK layer to look at position in realized + children to avoid realization races. (LP: #555816) + * Don't allow setting children twice + * Ref children of a menuitem + * Return error when parent ID of getlayout can't be found + * Adding in visible property to docs + * Helpful comments in the code + + -- Ted Gould Thu, 15 Apr 2010 01:25:42 -0500 + +libdbusmenu (0.2.9-0ubuntu1) lucid; urgency=low + + * New upstream release. + * Documentation fix + * Changing the parse function to get_children instead of + taking them. (LP: #471044) + * Supporting AboutToShow in event callbacks to catch up + with QT implementation. + * Unrefing on layout updates (LP: #545026) + * Resetting sync versions on disconnection + * Removing useless warning + + -- Ted Gould Thu, 01 Apr 2010 09:14:36 -0500 + +libdbusmenu (0.2.8-0ubuntu2) lucid; urgency=low + + * debian/control: + - restore vcs location, we move back to the non import version, the other + one don't allow merging trunk changes + + [ Ted Gould ] + * Upstream Merge + * Changing the parse function to get_children instead of + taking them. (LP: #471044) + * Supporting AboutToShow in event callbacks to catch up + with QT implementation. + * Unrefing on layout updates (LP: #545026) + * Resetting sync versions on disconnection + * Removing useless warning + + -- Sebastien Bacher Thu, 01 Apr 2010 12:36:06 +0200 + +libdbusmenu (0.2.8-0ubuntu1) lucid; urgency=low + + * debian/control + - Dropped Vcs-Bzr and Vcs-Browser + - Added extended description for gir1.0-dbusmenu-gtk-0.2 and + gir1.0-dbusmenu-glib-0.2 + + * debian/rules + - bumped shlibs version to 0.2.8 for libdbusmenu-glib1 + + [Ted Gould] + * Upstream release 0.2.8 + * Adding support for blank icons (LP: #534854) + * Remove unneeded warning (LP: #537312) + * Fix typo in documentation + + -- Ken VanDine Thu, 25 Mar 2010 11:35:46 -0400 + +libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.7 + * Adding in building of the GObject Introspection details + * Adding in building of VAPI files + * debian/control: + * Adding dependency on valac + * Adding in gir's as build dependencies. + * Adding in build dependencies for GIR dev + * Adding dependencies for gir-repository-dev and + gobject-introspection to ensure we get all the GI goodies. + * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, + debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to + hold the typelib files generated by GObject introspection. + * debian/libdbusmenu-glib-dev.install, + debian/libdbusmenu-gtk-dev.install: + * Added VAPI files to the packages. + * Added GIR files to the packages. + + -- Ted Gould Thu, 04 Mar 2010 11:13:43 -0600 + +libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.6 + * Fix testing to make it more reliable + * Remove delayed property queueing as it was causing properties to not + get updated. (lp: #524308) + + -- Ted Gould Thu, 25 Feb 2010 10:23:49 -0600 + +libdbusmenu (0.2.5-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.5 + * Adding in menuitem proxy object. + * Adding ID to default item. + * debian/rules: Updating shlibs + + -- Ted Gould Thu, 18 Feb 2010 11:00:24 -0600 + +libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.4 + * Remove uneccessary reference to stop duplication of menus + * Handle dbus method errors better + + -- Ted Gould Thu, 11 Feb 2010 10:13:56 -0600 + +libdbusmenu (0.2.3-0ubuntu3) lucid; urgency=low + + * Backported lp:~ted/dbusmenu/dbus-error-handling to fix the + indicator-applet crashing sometime on softwares close + (lp: #518900, #519019) + + -- Sebastien Bacher Wed, 10 Feb 2010 00:12:35 +0100 + +libdbusmenu (0.2.3-0ubuntu2) lucid; urgency=low + + * Upstream Merge + * Removing the ref to root and a setting of root + + -- Ted Gould Tue, 09 Feb 2010 08:53:00 -0600 + +libdbusmenu (0.2.3-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.3 + * Fixing handing of root IDs being zero + * Handling syncing of properties when reusing items + * Shipping new JSON files and READMEs for testing. + * libdbusmenu-tools.install: Add in json file and README so + that they're put in the right directories. + + -- Ted Gould Fri, 05 Feb 2010 11:24:58 -0800 + +libdbusmenu (0.2.2-0ubuntu3) lucid; urgency=low + + * debian/control: + - let libdbusmenu-glib1 breaks libdbusmenu-glib0 since they are create + issues at runtime if both got loaded + + -- Sebastien Bacher Thu, 04 Feb 2010 18:10:56 -0800 + +libdbusmenu (0.2.2-0ubuntu2) lucid; urgency=low + + * debian/control: fix a typo in the tools depends + + -- Sebastien Bacher Thu, 04 Feb 2010 14:18:47 -0800 + +libdbusmenu (0.2.2-0ubuntu1) lucid; urgency=low + + * Updated for the soname changes + + [ Ted Gould ] + * Upstream Release 0.2.2 + * Interoperability fixes + * Adding timestamps to events + * Better handling of XML + * Adding tools for timing dbusmenu + * debian/libdbusmenu-tools.install: Adding a wildcard to get + all of the tools in libexec + + -- Sebastien Bacher Thu, 04 Feb 2010 13:56:49 -0800 + +libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.1 + - Fix to not destroy the image if we're still using it. + - Adding code to support icon names that have an implied direction in them. + - Fix to put a small amount of padding between the icon and the label. + + -- Ken VanDine Tue, 12 Jan 2010 11:03:39 -0500 + +libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low + + * debian/rules: + - updated shlibs version (lp: #505258) + + -- Sebastien Bacher Mon, 11 Jan 2010 16:04:11 +0100 + +libdbusmenu (0.2.0-0ubuntu2) lucid; urgency=low + + * Added debian/libdbusmenu-tools.install + * debian/control + - improved description for libdbusmenu-tools + + -- Ken VanDine Sat, 09 Jan 2010 09:05:47 -0500 + +libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.0 + - Remove unused libdbusmenu-qt + - Changing API to be V0.2 for reals + - Adding underline support + - Test suite fixes and automation support + - dbus-dumper tool + - Switch to org.ayatana + - Fixing the handling of typed properties, especially bools. + - Adding GetChildren function for getting a single submenu + - Starting to watch DBus if the proxy builds fail. + - Test suite fixes + - Fixing the consistency between the #defines and what + was used in the code. + * debian/control, debian/libdbusmenu-tools.install: Setting + up a package for the new dbusmenu-dumper tool. + * debian/control: Mentioning nicely that this will cause + indicator-messages << 0.3 and indicator-session << 0.2 to + break. + + -- Ted Gould Fri, 08 Jan 2010 08:42:59 -0600 + +libdbusmenu (0.1.8-0ubuntu1) lucid; urgency=low + + * Upstream release 0.1.8 + * Changing the name to org.ayatana + * Underline fixes + * Documenation of the DBus API + * Adding the GPL v3 Copying file so that we're all legal. + + -- Ted Gould Thu, 10 Dec 2009 12:55:07 -0600 + +libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low + + * Upstream release 0.1.6 (LP: #442822) + * Managing the life-cycle of the GTK Menu item better to + ensure that it is positioned correctly and dies + appropriately. (LP: #430904) and (LP: #419953) + * Checking returned properties to ensure that there wasn't + DBus errors. (LP: #433719) + + -- Ted Gould Fri, 02 Oct 2009 17:00:45 -0500 + +libdbusmenu (0.1.5-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #436185) + + -- Ken VanDine Thu, 24 Sep 2009 17:12:25 -0400 + +libdbusmenu (0.1.4-0ubuntu1) karmic; urgency=low + + * Upstream release (LP: #432003) + - Applying a fix by not blocking if we're calling for the root. Everyone + should be listening for root changes anyway (lp: #427819) + + -- Ted Gould Thu, 17 Sep 2009 11:29:40 -0500 + +libdbusmenu (0.1.3-0ubuntu1) karmic; urgency=low + + * Upstream update 0.1.3 (LP: #427360) + * Fixes reordering of menu item issue + + -- Ted Gould Thu, 10 Sep 2009 08:43:47 -0500 + +libdbusmenu (0.1.2-0ubuntu1) karmic; urgency=low + + * debian/rules: + - updated shlib version + + [ Ted Gould ] + * Upstream release 0.1.2 (LP: #423958) + + [ Ken VanDine ] + * debian/control + - Specify full urls for Vcs-Bzr + + -- Sebastien Bacher Fri, 04 Sep 2009 11:12:38 +0200 + +libdbusmenu (0.1.0-0ubuntu1) karmic; urgency=low + + [ Ted Gould ] + * Upstream release 0.1.0 + * debian/watch: Added for tarball + * debian/control: + - Specify both Vcs-Bzr and Vcs-Browser + - Fixed the project name + + [ Martin Pitt ] + * Add bzr-builddep configuration for merge mode. + * debian/control: Fix Vcs-* links. + + -- Martin Pitt Thu, 27 Aug 2009 20:55:55 +0200 + +libdbusmenu (0.1~bzr5-0ubuntu1) karmic; urgency=low + + * First version. + + -- Ted Gould Wed, 05 Aug 2009 00:46:41 +0100 + --- libdbusmenu-0.3.98.orig/debian/source/format +++ libdbusmenu-0.3.98/debian/source/format @@ -0,0 +1 @@ +1.0 --- libdbusmenu-0.3.98.orig/libdbusmenu-glib/client.c +++ libdbusmenu-0.3.98/libdbusmenu-glib/client.c @@ -79,6 +79,7 @@ GCancellable * menuproxy_cancel; GCancellable * layoutcall; + GVariant * layout_props; gint current_revision; gint my_revision; @@ -316,6 +317,13 @@ priv->layoutcall = NULL; + gchar * layout_props[3]; + layout_props[0] = DBUSMENU_MENUITEM_PROP_TYPE; + layout_props[1] = DBUSMENU_MENUITEM_PROP_LABEL; + layout_props[2] = NULL; + priv->layout_props = g_variant_new_strv((const gchar * const *)layout_props, 2); + g_variant_ref_sink(priv->layout_props); + priv->current_revision = 0; priv->my_revision = 0; @@ -380,6 +388,11 @@ priv->layoutcall = NULL; } + if (priv->layout_props != NULL) { + g_variant_unref(priv->layout_props); + priv->layout_props = NULL; + } + /* Bring down the menu proxy, ensure we're not looking for one at the same time. */ if (priv->menuproxy_cancel != NULL) { @@ -1473,6 +1486,21 @@ parse_layout_update(childmi, client); } + /* Apply known properties sent in the structure to the + menu item. Sometimes they may just be copies */ + if (childmi != NULL) { + GVariantIter iter; + g_variant_iter_init(&iter, g_variant_get_child_value(child, 1)); + gchar * prop; + GVariant * value; + + while (g_variant_iter_next(&iter, "{sv}", &prop, &value)) { + dbusmenu_menuitem_property_set_variant(childmi, prop, value); + g_free(prop); + g_variant_unref(value); + } + } + position++; } @@ -1662,7 +1690,7 @@ g_variant_builder_add_value(&tupleb, g_variant_new_int32(0)); // root g_variant_builder_add_value(&tupleb, g_variant_new_int32(-1)); // recurse - g_variant_builder_add_value(&tupleb, g_variant_new_array(G_VARIANT_TYPE_STRING, NULL, 0)); // props + g_variant_builder_add_value(&tupleb, priv->layout_props); // props GVariant * args = g_variant_builder_end(&tupleb); // g_debug("Args (type: %s): %s", g_variant_get_type_string(args), g_variant_print(args, TRUE)); --- libdbusmenu-0.3.98.orig/libdbusmenu-glib/server.c +++ libdbusmenu-0.3.98/libdbusmenu-glib/server.c @@ -892,7 +892,9 @@ /* If so, we need to swap the value */ if (prop != NULL) { - g_variant_unref(prop->variant); + if (prop->variant != NULL) { + g_variant_unref(prop->variant); + } prop->variant = variant; } else { /* else we need to add it */ --- libdbusmenu-0.3.98.orig/libdbusmenu-glib/menuitem.c +++ libdbusmenu-0.3.98/libdbusmenu-glib/menuitem.c @@ -1274,7 +1274,7 @@ GVariant * final_variant = NULL; - if (g_hash_table_size(priv->properties) > 0) { + if (properties == NULL && g_hash_table_size(priv->properties) > 0) { GVariantBuilder builder; g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY); @@ -1283,6 +1283,33 @@ final_variant = g_variant_builder_end(&builder); } + if (properties != NULL) { + GVariantBuilder builder; + gboolean builder_init = FALSE; + int i = 0; const gchar * prop; + + for (prop = properties[i]; prop != NULL; prop = properties[++i]) { + GVariant * propvalue = dbusmenu_menuitem_property_get_variant(mi, prop); + + if (propvalue == NULL) { + continue; + } + + if (!builder_init) { + builder_init = TRUE; + g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY); + } + + GVariant * dict = g_variant_new_dict_entry(g_variant_new_string((gchar *)prop), + g_variant_new_variant((GVariant *)propvalue)); + g_variant_builder_add_value(&builder, dict); + } + + if (builder_init) { + final_variant = g_variant_builder_end(&builder); + } + } + return final_variant; }