1 files changed, 12 insertions, 12 deletions

diff --git a/tests/tools/expected-gtypes-body.h b/tests/tools/expected-gtypes-body.h
index ab1d7e99a..be1db8a06 100644
--- a/tests/tools/expected-gtypes-body.h
+++ b/tests/tools/expected-gtypes-body.h
@@ -5,32 +5,32 @@
  */
 
 GType
-the_prefix_type_dbus_hash_ss (void)
+the_prefix_type_dbus_hash_sv (void)
 {
   static GType t = 0;
 
   if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING);
+    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
   return t;
 }
 
 GType
-the_prefix_type_dbus_hash_sa_7bsv_7d (void)
+the_prefix_type_dbus_hash_ss (void)
 {
   static GType t = 0;
 
   if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)));
+    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING);
   return t;
 }
 
 GType
-the_prefix_type_dbus_hash_sv (void)
+the_prefix_type_dbus_hash_sa_7bsv_7d (void)
 {
   static GType t = 0;
 
   if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
+    t = dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE)));
   return t;
 }
 
@@ -69,32 +69,32 @@ the_prefix_type_dbus_array_isu (void)
 }
 
 GType
-the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void)
+the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void)
 {
   static GType t = 0;
 
   if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sa_7bsv_7d ());
+    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_saa_7bsv_7d ());
   return t;
 }
 
 GType
-the_prefix_type_dbus_array_of_a_7bsv_7d (void)
+the_prefix_type_dbus_array_of_a_7bsa_7bsv_7d_7d (void)
 {
   static GType t = 0;
 
   if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sv ());
+    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sa_7bsv_7d ());
   return t;
 }
 
 GType
-the_prefix_type_dbus_array_of_a_7bsaa_7bsv_7d_7d (void)
+the_prefix_type_dbus_array_of_a_7bsv_7d (void)
 {
   static GType t = 0;
 
   if (G_UNLIKELY (t == 0))
-    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_saa_7bsv_7d ());
+    t = dbus_g_type_get_collection ("GPtrArray", the_prefix_type_dbus_hash_sv ());
   return t;
 }