Switching to use an internal builder for the tuple to make things more explicit.

1 files changed, 7 insertions, 1 deletions

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;
 }