diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-26 11:13:05 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-26 11:13:05 -0600 |
| commit | 6dbb9280a12c584cf070ddb13242f3b1c9105742 (patch) | |
| tree | 4e63e1e2896619b18b3cd925a2963b893c7eb10b | |
| parent | fa16a4e84152c957c22252b20d4e87f6d85c53f3 (diff) | |
| parent | 025b5f2dfad9c8bd65d1c6b055bea2d8fd1ab33d (diff) | |
| download | libdbusmenu-6dbb9280a12c584cf070ddb13242f3b1c9105742.tar.gz libdbusmenu-6dbb9280a12c584cf070ddb13242f3b1c9105742.tar.bz2 libdbusmenu-6dbb9280a12c584cf070ddb13242f3b1c9105742.zip | |
* Upstream Merge
* Changing tuple building
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 8620f55..c3c410c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.93-0ubuntu2~ted7) UNRELEASED; urgency=low + + * Upstream Merge + * Changing tuple building + + -- Ted Gould <ted@ubuntu.com> Wed, 26 Jan 2011 11:12:46 -0600 + libdbusmenu (0.3.93-0ubuntu2~ted6) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index b6e5fa1..adb9f91 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -1026,7 +1026,8 @@ bus_get_children (DbusmenuServer * server, GVariant * params, GDBusMethodInvocat g_list_foreach(children, serialize_menuitem, &builder); - ret = g_variant_new("(a(ia{sv}))", g_variant_builder_end(&builder)); + GVariant * end = g_variant_builder_end(&builder); + ret = g_variant_new_tuple(&end, 1); } else { GError * error = NULL; ret = g_variant_parse(g_variant_type_new("(a(ia{sv}))"), "([(0, {})],)", NULL, NULL, &error); |