From 936836ea02eb7c0825e93b0a3b8be3a3fb9b2ee0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 26 Jan 2011 09:56:44 -0600 Subject: Even though we all love SVG, it's not a valid signature --- libdbusmenu-glib/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 095f333..821d3cb 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -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); -- cgit v1.2.3 From 248c7a0428b8e05048d1e9891242db82c82f067a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 26 Jan 2011 10:07:20 -0600 Subject: Changing the builder add call --- libdbusmenu-glib/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 821d3cb..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; } -- cgit v1.2.3 From ea502b22c0b3d34e58e0db774d5edfd28b7f2d41 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 26 Jan 2011 10:55:54 -0600 Subject: Switching to use an internal builder for the tuple to make things more explicit. --- libdbusmenu-glib/server.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index dda0c09..b6e5fa1 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -975,11 +975,17 @@ serialize_menuitem(gpointer data, gpointer user_data) { DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data); GVariantBuilder * builder = (GVariantBuilder *)(user_data); + GVariantBuilder tuple; + + g_variant_builder_init(&tuple, G_VARIANT_TYPE_TUPLE); gint id = dbusmenu_menuitem_get_id(mi); + g_variant_builder_add_value(&tuple, g_variant_new_int32(id)); + GVariant * props = dbusmenu_menuitem_properties_variant(mi); + g_variant_builder_add_value(&tuple, props); - g_variant_builder_add(builder, "(ia{sv})", id, props); + g_variant_builder_add_value(builder, g_variant_builder_end(&tuple)); return; } -- cgit v1.2.3 From 025b5f2dfad9c8bd65d1c6b055bea2d8fd1ab33d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 26 Jan 2011 11:12:04 -0600 Subject: Make the tuple without specifying the type so we don't need to build a new one. --- libdbusmenu-glib/server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3