aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--libdbusmenu-glib/server.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 44d6e57..a193f4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ libdbusmenu (0.3.93-0ubuntu2~ted5) UNRELEASED; urgency=low
* Upstream Merge
* Fixing some memory leaks
+ * Fixing signatures in GetChildren
- -- Ted Gould <ted@ubuntu.com> Wed, 26 Jan 2011 10:18:17 -0600
+ -- Ted Gould <ted@ubuntu.com> Wed, 26 Jan 2011 10:18:50 -0600
libdbusmenu (0.3.93-0ubuntu2~ted4) natty; urgency=low
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index 095f333..dda0c09 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -979,7 +979,7 @@ serialize_menuitem(gpointer data, gpointer user_data)
gint id = dbusmenu_menuitem_get_id(mi);
GVariant * props = dbusmenu_menuitem_properties_variant(mi);
- g_variant_builder_add(builder, "ia{sv}", id, props);
+ g_variant_builder_add(builder, "(ia{sv})", id, props);
return;
}
@@ -1020,7 +1020,7 @@ bus_get_children (DbusmenuServer * server, GVariant * params, GDBusMethodInvocat
g_list_foreach(children, serialize_menuitem, &builder);
- ret = g_variant_new("(a(ia{svg}))", g_variant_builder_end(&builder));
+ ret = g_variant_new("(a(ia{sv}))", g_variant_builder_end(&builder));
} else {
GError * error = NULL;
ret = g_variant_parse(g_variant_type_new("(a(ia{sv}))"), "([(0, {})],)", NULL, NULL, &error);