Reformat code to GNU style

This was achieved by running "indent -gnu -i2 -nut -l120" over C files which use a
different style, and manually fixing pointer declarations and modelines.

4 files changed, 1973 insertions, 1872 deletions

diff --git a/examples/glib-print.c b/examples/glib-print.c
index 606a29f3..4e117d9d 100644
--- a/examples/glib-print.c
+++ b/examples/glib-print.c
@@ -1,44 +1,48 @@
 #include <girepository.h>
 
-int main(void)
+int
+main (void)
 {
-    GIRepository *repository;
-    GError *error = NULL;
-    GIBaseInfo *base_info;
-    GIArgument in_args[5];
-    GIArgument retval;
+  GIRepository *repository;
+  GError *error = NULL;
+  GIBaseInfo *base_info;
+  GIArgument in_args[5];
+  GIArgument retval;
 
-    repository = g_irepository_get_default();
-    g_irepository_require(repository, "GLib", "2.0", 0, &error);
-    if (error) {
-      g_error("ERROR: %s\n", error->message);
+  repository = g_irepository_get_default ();
+  g_irepository_require (repository, "GLib", "2.0", 0, &error);
+  if (error)
+    {
+      g_error ("ERROR: %s\n", error->message);
       return 1;
     }
 
-    base_info = g_irepository_find_by_name(repository, "GLib", "assertion_message");
-    if (!base_info) {
-      g_error("ERROR: %s\n", "Could not find GLib.warn_message");
+  base_info = g_irepository_find_by_name (repository, "GLib", "assertion_message");
+  if (!base_info)
+    {
+      g_error ("ERROR: %s\n", "Could not find GLib.warn_message");
       return 1;
     }
 
-    in_args[0].v_pointer = "domain";
-    in_args[1].v_pointer = "glib-print.c";
-    in_args[2].v_pointer = "30";
-    in_args[3].v_pointer = "main";
-    in_args[4].v_pointer = "hello world";
+  in_args[0].v_pointer = "domain";
+  in_args[1].v_pointer = "glib-print.c";
+  in_args[2].v_pointer = "30";
+  in_args[3].v_pointer = "main";
+  in_args[4].v_pointer = "hello world";
 
-    if (!g_function_info_invoke ((GIFunctionInfo *)base_info,
-                                 (const GIArgument*)&in_args,
-                                 5,
-                                 NULL,
-                                 0,
-                                 &retval,
-                                 &error)) {
-      g_error("ERROR: %s\n", error->message);
+  if (!g_function_info_invoke ((GIFunctionInfo *) base_info,
+                               (const GIArgument *) &in_args,
+                               5,
+                               NULL,
+                               0,
+                               &retval,
+                               &error))
+    {
+      g_error ("ERROR: %s\n", error->message);
       return 1;
     }
 
-    g_base_info_unref (base_info);
+  g_base_info_unref (base_info);
 
-    return 0;
+  return 0;
 }
diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c
index 4f4be615..0869a9a2 100644
--- a/tests/gimarshallingtests.c
+++ b/tests/gimarshallingtests.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- * vim: tabstop=4 shiftwidth=4 expandtab
+ *vim: tabstop=4 shiftwidth=4 expandtab
  */
 
 #include "gimarshallingtests.h"
@@ -13,25 +13,25 @@ static void gi_marshalling_tests_boxed_struct_free (GIMarshallingTestsBoxedStruc
 gboolean
 gi_marshalling_tests_boolean_return_true (void)
 {
-    return TRUE;
+  return TRUE;
 }
 
 gboolean
 gi_marshalling_tests_boolean_return_false (void)
 {
-    return FALSE;
+  return FALSE;
 }
 
 void
 gi_marshalling_tests_boolean_in_true (gboolean v)
 {
-    g_assert (v == TRUE);
+  g_assert (v == TRUE);
 }
 
 void
 gi_marshalling_tests_boolean_in_false (gboolean v)
 {
-    g_assert (v == FALSE);
+  g_assert (v == FALSE);
 }
 
 /**
@@ -41,7 +41,7 @@ gi_marshalling_tests_boolean_in_false (gboolean v)
 void
 gi_marshalling_tests_boolean_out_true (gboolean *v)
 {
-    *v = TRUE;
+  *v = TRUE;
 }
 
 /**
@@ -51,7 +51,7 @@ gi_marshalling_tests_boolean_out_true (gboolean *v)
 void
 gi_marshalling_tests_boolean_out_false (gboolean *v)
 {
-    *v = FALSE;
+  *v = FALSE;
 }
 
 /**
@@ -61,8 +61,8 @@ gi_marshalling_tests_boolean_out_false (gboolean *v)
 void
 gi_marshalling_tests_boolean_inout_true_false (gboolean *v)
 {
-    g_assert (*v == TRUE);
-    *v = FALSE;
+  g_assert (*v == TRUE);
+  *v = FALSE;
 }
 
 /**
@@ -72,8 +72,8 @@ gi_marshalling_tests_boolean_inout_true_false (gboolean *v)
 void
 gi_marshalling_tests_boolean_inout_false_true (gboolean *v)
 {
-    g_assert (*v == FALSE);
-    *v = TRUE;
+  g_assert (*v == FALSE);
+  *v = TRUE;
 }
 
 
@@ -82,25 +82,25 @@ gi_marshalling_tests_boolean_inout_false_true (gboolean *v)
 gint8
 gi_marshalling_tests_int8_return_max (void)
 {
-    return G_MAXINT8;
+  return G_MAXINT8;
 }
 
 gint8
 gi_marshalling_tests_int8_return_min (void)
 {
-    return G_MININT8;
+  return G_MININT8;
 }
 
 void
 gi_marshalling_tests_int8_in_max (gint8 v)
 {
-    g_assert_cmpint(v, ==, G_MAXINT8);
+  g_assert_cmpint (v, ==, G_MAXINT8);
 }
 
 void
 gi_marshalling_tests_int8_in_min (gint8 v)
 {
-    g_assert_cmpint(v, ==, G_MININT8);
+  g_assert_cmpint (v, ==, G_MININT8);
 }
 
 /**
@@ -110,7 +110,7 @@ gi_marshalling_tests_int8_in_min (gint8 v)
 void
 gi_marshalling_tests_int8_out_max (gint8 *v)
 {
-    *v = G_MAXINT8;
+  *v = G_MAXINT8;
 }
 
 /**
@@ -120,7 +120,7 @@ gi_marshalling_tests_int8_out_max (gint8 *v)
 void
 gi_marshalling_tests_int8_out_min (gint8 *v)
 {
-    *v = G_MININT8;
+  *v = G_MININT8;
 }
 
 /**
@@ -130,8 +130,8 @@ gi_marshalling_tests_int8_out_min (gint8 *v)
 void
 gi_marshalling_tests_int8_inout_max_min (gint8 *v)
 {
-    g_assert_cmpint(*v, ==, G_MAXINT8);
-    *v = G_MININT8;
+  g_assert_cmpint (*v, ==, G_MAXINT8);
+  *v = G_MININT8;
 }
 
 /**
@@ -141,21 +141,21 @@ gi_marshalling_tests_int8_inout_max_min (gint8 *v)
 void
 gi_marshalling_tests_int8_inout_min_max (gint8 *v)
 {
-    g_assert_cmpint(*v, ==, G_MININT8);
-    *v = G_MAXINT8;
+  g_assert_cmpint (*v, ==, G_MININT8);
+  *v = G_MAXINT8;
 }
 
 
 guint8
 gi_marshalling_tests_uint8_return (void)
 {
-    return G_MAXUINT8;
+  return G_MAXUINT8;
 }
 
 void
 gi_marshalling_tests_uint8_in (guint8 v)
 {
-    g_assert_cmpuint(v, ==, G_MAXUINT8);
+  g_assert_cmpuint (v, ==, G_MAXUINT8);
 }
 
 /**
@@ -165,7 +165,7 @@ gi_marshalling_tests_uint8_in (guint8 v)
 void
 gi_marshalling_tests_uint8_out (guint8 *v)
 {
-    *v = G_MAXUINT8;
+  *v = G_MAXUINT8;
 }
 
 /**
@@ -175,33 +175,33 @@ gi_marshalling_tests_uint8_out (guint8 *v)
 void
 gi_marshalling_tests_uint8_inout (guint8 *v)
 {
-    g_assert_cmpuint(*v, ==, G_MAXUINT8);
-    *v = 0;
+  g_assert_cmpuint (*v, ==, G_MAXUINT8);
+  *v = 0;
 }
 
 
 gint16
 gi_marshalling_tests_int16_return_max (void)
 {
-    return G_MAXINT16;
+  return G_MAXINT16;
 }
 
 gint16
 gi_marshalling_tests_int16_return_min (void)
 {
-    return G_MININT16;
+  return G_MININT16;
 }
 
 void
 gi_marshalling_tests_int16_in_max (gint16 v)
 {
-    g_assert_cmpint(v, ==, G_MAXINT16);
+  g_assert_cmpint (v, ==, G_MAXINT16);
 }
 
 void
 gi_marshalling_tests_int16_in_min (gint16 v)
 {
-    g_assert_cmpint(v, ==, G_MININT16);
+  g_assert_cmpint (v, ==, G_MININT16);
 }
 
 /**
@@ -211,7 +211,7 @@ gi_marshalling_tests_int16_in_min (gint16 v)
 void
 gi_marshalling_tests_int16_out_max (gint16 *v)
 {
-    *v = G_MAXINT16;
+  *v = G_MAXINT16;
 }
 
 /**
@@ -221,7 +221,7 @@ gi_marshalling_tests_int16_out_max (gint16 *v)
 void
 gi_marshalling_tests_int16_out_min (gint16 *v)
 {
-    *v = G_MININT16;
+  *v = G_MININT16;
 }
 
 /**
@@ -231,8 +231,8 @@ gi_marshalling_tests_int16_out_min (gint16 *v)
 void
 gi_marshalling_tests_int16_inout_max_min (gint16 *v)
 {
-    g_assert_cmpint(*v, ==, G_MAXINT16);
-    *v = G_MININT16;
+  g_assert_cmpint (*v, ==, G_MAXINT16);
+  *v = G_MININT16;
 }
 
 /**
@@ -242,21 +242,21 @@ gi_marshalling_tests_int16_inout_max_min (gint16 *v)
 void
 gi_marshalling_tests_int16_inout_min_max (gint16 *v)
 {
-    g_assert_cmpint(*v, ==, G_MININT16);
-    *v = G_MAXINT16;
+  g_assert_cmpint (*v, ==, G_MININT16);
+  *v = G_MAXINT16;
 }
 
 
 guint16
 gi_marshalling_tests_uint16_return (void)
 {
-    return G_MAXUINT16;
+  return G_MAXUINT16;
 }
 
 void
 gi_marshalling_tests_uint16_in (guint16 v)
 {
-    g_assert_cmpuint(v, ==, G_MAXUINT16);
+  g_assert_cmpuint (v, ==, G_MAXUINT16);
 }
 
 /**
@@ -266,7 +266,7 @@ gi_marshalling_tests_uint16_in (guint16 v)
 void
 gi_marshalling_tests_uint16_out (guint16 *v)
 {
-    *v = G_MAXUINT16;
+  *v = G_MAXUINT16;
 }
 
 /**
@@ -276,33 +276,33 @@ gi_marshalling_tests_uint16_out (guint16 *v)
 void
 gi_marshalling_tests_uint16_inout (guint16 *v)
 {
-    g_assert_cmpuint(*v, ==, G_MAXUINT16);
-    *v = 0;
+  g_assert_cmpuint (*v, ==, G_MAXUINT16);
+  *v = 0;
 }
 
 
 gint32
 gi_marshalling_tests_int32_return_max (void)
 {
-    return G_MAXINT32;
+  return G_MAXINT32;
 }
 
 gint32
 gi_marshalling_tests_int32_return_min (void)
 {
-    return G_MININT32;
+  return G_MININT32;
 }
 
 void
 gi_marshalling_tests_int32_in_max (gint32 v)
 {
-    g_assert_cmpint(v, ==, G_MAXINT32);
+  g_assert_cmpint (v, ==, G_MAXINT32);
 }
 
 void
 gi_marshalling_tests_int32_in_min (gint32 v)
 {
-    g_assert_cmpint(v, ==, G_MININT32);
+  g_assert_cmpint (v, ==, G_MININT32);
 }
 
 /**
@@ -312,7 +312,7 @@ gi_marshalling_tests_int32_in_min (gint32 v)
 void
 gi_marshalling_tests_int32_out_max (gint32 *v)
 {
-    *v = G_MAXINT32;
+  *v = G_MAXINT32;
 }
 
 /**
@@ -322,7 +322,7 @@ gi_marshalling_tests_int32_out_max (gint32 *v)
 void
 gi_marshalling_tests_int32_out_min (gint32 *v)
 {
-    *v = G_MININT32;
+  *v = G_MININT32;
 }
 
 /**
@@ -332,8 +332,8 @@ gi_marshalling_tests_int32_out_min (gint32 *v)
 void
 gi_marshalling_tests_int32_inout_max_min (gint32 *v)
 {
-    g_assert_cmpint(*v, ==, G_MAXINT32);
-    *v = G_MININT32;
+  g_assert_cmpint (*v, ==, G_MAXINT32);
+  *v = G_MININT32;
 }
 
 /**
@@ -343,21 +343,21 @@ gi_marshalling_tests_int32_inout_max_min (gint32 *v)
 void
 gi_marshalling_tests_int32_inout_min_max (gint32 *v)
 {
-    g_assert_cmpint(*v, ==, G_MININT32);
-    *v = G_MAXINT32;
+  g_assert_cmpint (*v, ==, G_MININT32);
+  *v = G_MAXINT32;
 }
 
 
 guint32
 gi_marshalling_tests_uint32_return (void)
 {
-    return G_MAXUINT32;
+  return G_MAXUINT32;
 }
 
 void
 gi_marshalling_tests_uint32_in (guint32 v)
 {
-    g_assert_cmpuint(v, ==, G_MAXUINT32);
+  g_assert_cmpuint (v, ==, G_MAXUINT32);
 }
 
 /**
@@ -367,7 +367,7 @@ gi_marshalling_tests_uint32_in (guint32 v)
 void
 gi_marshalling_tests_uint32_out (guint32 *v)
 {
-    *v = G_MAXUINT32;
+  *v = G_MAXUINT32;
 }
 
 /**
@@ -377,33 +377,33 @@ gi_marshalling_tests_uint32_out (guint32 *v)
 void
 gi_marshalling_tests_uint32_inout (guint32 *v)
 {
-    g_assert_cmpuint(*v, ==, G_MAXUINT32);
-    *v = 0;
+  g_assert_cmpuint (*v, ==, G_MAXUINT32);
+  *v = 0;
 }
 
 
 gint64
 gi_marshalling_tests_int64_return_max (void)
 {
-    return G_MAXINT64;
+  return G_MAXINT64;
 }
 
 gint64
 gi_marshalling_tests_int64_return_min (void)
 {
-    return G_MININT64;
+  return G_MININT64;
 }
 
 void
 gi_marshalling_tests_int64_in_max (gint64 v)
 {
-    g_assert_cmpint(v, ==, G_MAXINT64);
+  g_assert_cmpint (v, ==, G_MAXINT64);
 }
 
 void
 gi_marshalling_tests_int64_in_min (gint64 v)
 {
-    g_assert_cmpint(v, ==, G_MININT64);
+  g_assert_cmpint (v, ==, G_MININT64);
 }
 
 /**
@@ -413,7 +413,7 @@ gi_marshalling_tests_int64_in_min (gint64 v)
 void
 gi_marshalling_tests_int64_out_max (gint64 *v)
 {
-    *v = G_MAXINT64;
+  *v = G_MAXINT64;
 }
 
 /**
@@ -423,7 +423,7 @@ gi_marshalling_tests_int64_out_max (gint64 *v)
 void
 gi_marshalling_tests_int64_out_min (gint64 *v)
 {
-    *v = G_MININT64;
+  *v = G_MININT64;
 }
 
 /**
@@ -433,8 +433,8 @@ gi_marshalling_tests_int64_out_min (gint64 *v)
 void
 gi_marshalling_tests_int64_inout_max_min (gint64 *v)
 {
-    g_assert_cmpint(*v, ==, G_MAXINT64);
-    *v = G_MININT64;
+  g_assert_cmpint (*v, ==, G_MAXINT64);
+  *v = G_MININT64;
 }
 
 /**
@@ -444,21 +444,21 @@ gi_marshalling_tests_int64_inout_max_min (gint64 *v)
 void
 gi_marshalling_tests_int64_inout_min_max (gint64 *v)
 {
-    g_assert_cmpint(*v, ==, G_MININT64);
-    *v = G_MAXINT64;
+  g_assert_cmpint (*v, ==, G_MININT64);
+  *v = G_MAXINT64;
 }
 
 
 guint64
 gi_marshalling_tests_uint64_return (void)
 {
-    return G_MAXUINT64;
+  return G_MAXUINT64;
 }
 
 void
 gi_marshalling_tests_uint64_in (guint64 v)
 {
-    g_assert_cmpuint(v, ==, G_MAXUINT64);
+  g_assert_cmpuint (v, ==, G_MAXUINT64);
 }
 
 /**
@@ -468,7 +468,7 @@ gi_marshalling_tests_uint64_in (guint64 v)
 void
 gi_marshalling_tests_uint64_out (guint64 *v)
 {
-    *v = G_MAXUINT64;
+  *v = G_MAXUINT64;
 }
 
 /**
@@ -478,33 +478,33 @@ gi_marshalling_tests_uint64_out (guint64 *v)
 void
 gi_marshalling_tests_uint64_inout (guint64 *v)
 {
-    g_assert_cmpuint(*v, ==, G_MAXUINT64);
-    *v = 0;
+  g_assert_cmpuint (*v, ==, G_MAXUINT64);
+  *v = 0;
 }
 
 
 gshort
 gi_marshalling_tests_short_return_max (void)
 {
-    return G_MAXSHORT;
+  return G_MAXSHORT;
 }
 
 gshort
 gi_marshalling_tests_short_return_min (void)
 {
-    return G_MINSHORT;
+  return G_MINSHORT;
 }
 
 void
 gi_marshalling_tests_short_in_max (gshort short_)
 {
-    g_assert_cmpint(short_, ==, G_MAXSHORT);
+  g_assert_cmpint (short_, ==, G_MAXSHORT);
 }
 
 void
 gi_marshalling_tests_short_in_min (gshort short_)
 {
-    g_assert_cmpint(short_, ==, G_MINSHORT);
+  g_assert_cmpint (short_, ==, G_MINSHORT);
 }
 
 /**
@@ -514,7 +514,7 @@ gi_marshalling_tests_short_in_min (gshort short_)
 void
 gi_marshalling_tests_short_out_max (gshort *short_)
 {
-    *short_ = G_MAXSHORT;
+  *short_ = G_MAXSHORT;
 }
 
 /**
@@ -524,7 +524,7 @@ gi_marshalling_tests_short_out_max (gshort *short_)
 void
 gi_marshalling_tests_short_out_min (gshort *short_)
 {
-    *short_ = G_MINSHORT;
+  *short_ = G_MINSHORT;
 }
 
 /**
@@ -534,8 +534,8 @@ gi_marshalling_tests_short_out_min (gshort *short_)
 void
 gi_marshalling_tests_short_inout_max_min (gshort *short_)
 {
-    g_assert_cmpint(*short_, ==, G_MAXSHORT);
-    *short_ = G_MINSHORT;
+  g_assert_cmpint (*short_, ==, G_MAXSHORT);
+  *short_ = G_MINSHORT;
 }
 
 /**
@@ -545,21 +545,21 @@ gi_marshalling_tests_short_inout_max_min (gshort *short_)
 void
 gi_marshalling_tests_short_inout_min_max (gshort *short_)
 {
-    g_assert_cmpint(*short_, ==, G_MINSHORT);
-    *short_ = G_MAXSHORT;
+  g_assert_cmpint (*short_, ==, G_MINSHORT);
+  *short_ = G_MAXSHORT;
 }
 
 
 gushort
 gi_marshalling_tests_ushort_return (void)
 {
-    return G_MAXUSHORT;
+  return G_MAXUSHORT;
 }
 
 void
 gi_marshalling_tests_ushort_in (gushort ushort_)
 {
-    g_assert_cmpuint(ushort_, ==, G_MAXUSHORT);
+  g_assert_cmpuint (ushort_, ==, G_MAXUSHORT);
 }
 
 /**
@@ -569,7 +569,7 @@ gi_marshalling_tests_ushort_in (gushort ushort_)
 void
 gi_marshalling_tests_ushort_out (gushort *ushort_)
 {
-    *ushort_ = G_MAXUSHORT;
+  *ushort_ = G_MAXUSHORT;
 }
 
 /**
@@ -579,33 +579,33 @@ gi_marshalling_tests_ushort_out (gushort *ushort_)
 void
 gi_marshalling_tests_ushort_inout (gushort *ushort_)
 {
-    g_assert_cmpuint(*ushort_, ==, G_MAXUSHORT);
-    *ushort_ = 0;
+  g_assert_cmpuint (*ushort_, ==, G_MAXUSHORT);
+  *ushort_ = 0;
 }
 
 
 gint
 gi_marshalling_tests_int_return_max (void)
 {
-    return G_MAXINT;
+  return G_MAXINT;
 }
 
 gint
 gi_marshalling_tests_int_return_min (void)
 {
-    return G_MININT;
+  return G_MININT;
 }
 
 void
 gi_marshalling_tests_int_in_max (gint int_)
 {
-    g_assert_cmpint(int_, ==, G_MAXINT);
+  g_assert_cmpint (int_, ==, G_MAXINT);
 }
 
 void
 gi_marshalling_tests_int_in_min (gint int_)
 {
-    g_assert_cmpint(int_, ==, G_MININT);
+  g_assert_cmpint (int_, ==, G_MININT);
 }
 
 /**
@@ -615,7 +615,7 @@ gi_marshalling_tests_int_in_min (gint int_)
 void
 gi_marshalling_tests_int_out_max (gint *int_)
 {
-    *int_ = G_MAXINT;
+  *int_ = G_MAXINT;
 }
 
 /**
@@ -625,7 +625,7 @@ gi_marshalling_tests_int_out_max (gint *int_)
 void
 gi_marshalling_tests_int_out_min (gint *int_)
 {
-    *int_ = G_MININT;
+  *int_ = G_MININT;
 }
 
 /**
@@ -635,8 +635,8 @@ gi_marshalling_tests_int_out_min (gint *int_)
 void
 gi_marshalling_tests_int_inout_max_min (gint *int_)
 {
-    g_assert_cmpint(*int_, ==, G_MAXINT);
-    *int_ = G_MININT;
+  g_assert_cmpint (*int_, ==, G_MAXINT);
+  *int_ = G_MININT;
 }
 
 /**
@@ -646,21 +646,21 @@ gi_marshalling_tests_int_inout_max_min (gint *int_)
 void
 gi_marshalling_tests_int_inout_min_max (gint *int_)
 {
-    g_assert_cmpint(*int_, ==, G_MININT);
-    *int_ = G_MAXINT;
+  g_assert_cmpint (*int_, ==, G_MININT);
+  *int_ = G_MAXINT;
 }
 
 
 guint
 gi_marshalling_tests_uint_return (void)
 {
-    return G_MAXUINT;
+  return G_MAXUINT;
 }
 
 void
 gi_marshalling_tests_uint_in (guint uint_)
 {
-    g_assert_cmpuint(uint_, ==, G_MAXUINT);
+  g_assert_cmpuint (uint_, ==, G_MAXUINT);
 }
 
 /**
@@ -670,7 +670,7 @@ gi_marshalling_tests_uint_in (guint uint_)
 void
 gi_marshalling_tests_uint_out (guint *uint_)
 {
-    *uint_ = G_MAXUINT;
+  *uint_ = G_MAXUINT;
 }
 
 /**
@@ -680,33 +680,33 @@ gi_marshalling_tests_uint_out (guint *uint_)
 void
 gi_marshalling_tests_uint_inout (guint *uint_)
 {
-    g_assert_cmpuint(*uint_, ==, G_MAXUINT);
-    *uint_ = 0;
+  g_assert_cmpuint (*uint_, ==, G_MAXUINT);
+  *uint_ = 0;
 }
 
 
 glong
 gi_marshalling_tests_long_return_max (void)
 {
-    return G_MAXLONG;
+  return G_MAXLONG;
 }
 
 glong
 gi_marshalling_tests_long_return_min (void)
 {
-    return G_MINLONG;
+  return G_MINLONG;
 }
 
 void
 gi_marshalling_tests_long_in_max (glong long_)
 {
-    g_assert_cmpint(long_, ==, G_MAXLONG);
+  g_assert_cmpint (long_, ==, G_MAXLONG);
 }
 
 void
 gi_marshalling_tests_long_in_min (glong long_)
 {
-    g_assert_cmpint(long_, ==, G_MINLONG);
+  g_assert_cmpint (long_, ==, G_MINLONG);
 }
 
 /**
@@ -716,7 +716,7 @@ gi_marshalling_tests_long_in_min (glong long_)
 void
 gi_marshalling_tests_long_out_max (glong *long_)
 {
-    *long_ = G_MAXLONG;
+  *long_ = G_MAXLONG;
 }
 
 /**
@@ -726,7 +726,7 @@ gi_marshalling_tests_long_out_max (glong *long_)
 void
 gi_marshalling_tests_long_out_min (glong *long_)
 {
-    *long_ = G_MINLONG;
+  *long_ = G_MINLONG;
 }
 
 /**
@@ -736,8 +736,8 @@ gi_marshalling_tests_long_out_min (glong *long_)
 void
 gi_marshalling_tests_long_inout_max_min (glong *long_)
 {
-    g_assert_cmpint(*long_, ==, G_MAXLONG);
-    *long_ = G_MINLONG;
+  g_assert_cmpint (*long_, ==, G_MAXLONG);
+  *long_ = G_MINLONG;
 }
 
 /**
@@ -747,21 +747,21 @@ gi_marshalling_tests_long_inout_max_min (glong *long_)
 void
 gi_marshalling_tests_long_inout_min_max (glong *long_)
 {
-    g_assert_cmpint(*long_, ==, G_MINLONG);
-    *long_ = G_MAXLONG;
+  g_assert_cmpint (*long_, ==, G_MINLONG);
+  *long_ = G_MAXLONG;
 }
 
 
 gulong
 gi_marshalling_tests_ulong_return (void)
 {
-    return G_MAXULONG;
+  return G_MAXULONG;
 }
 
 void
 gi_marshalling_tests_ulong_in (gulong ulong_)
 {
-    g_assert_cmpuint(ulong_, ==, G_MAXULONG);
+  g_assert_cmpuint (ulong_, ==, G_MAXULONG);
 }
 
 /**
@@ -771,7 +771,7 @@ gi_marshalling_tests_ulong_in (gulong ulong_)
 void
 gi_marshalling_tests_ulong_out (gulong *ulong_)
 {
-    *ulong_ = G_MAXULONG;
+  *ulong_ = G_MAXULONG;
 }
 
 /**
@@ -781,33 +781,33 @@ gi_marshalling_tests_ulong_out (gulong *ulong_)
 void
 gi_marshalling_tests_ulong_inout (gulong *ulong_)
 {
-    g_assert_cmpuint(*ulong_, ==, G_MAXULONG);
-    *ulong_ = 0;
+  g_assert_cmpuint (*ulong_, ==, G_MAXULONG);
+  *ulong_ = 0;
 }
 
 
 gssize
 gi_marshalling_tests_ssize_return_max (void)
 {
-    return G_MAXSSIZE;
+  return G_MAXSSIZE;
 }
 
 gssize
 gi_marshalling_tests_ssize_return_min (void)
 {
-    return G_MINSSIZE;
+  return G_MINSSIZE;
 }
 
 void
 gi_marshalling_tests_ssize_in_max (gssize ssize)
 {
-    g_assert_cmpint(ssize, ==, G_MAXSSIZE);
+  g_assert_cmpint (ssize, ==, G_MAXSSIZE);
 }
 
 void
 gi_marshalling_tests_ssize_in_min (gssize ssize)
 {
-    g_assert_cmpint(ssize, ==, G_MINSSIZE);
+  g_assert_cmpint (ssize, ==, G_MINSSIZE);
 }
 
 /**
@@ -817,7 +817,7 @@ gi_marshalling_tests_ssize_in_min (gssize ssize)
 void
 gi_marshalling_tests_ssize_out_max (gssize *ssize)
 {
-    *ssize = G_MAXSSIZE;
+  *ssize = G_MAXSSIZE;
 }
 
 /**
@@ -827,7 +827,7 @@ gi_marshalling_tests_ssize_out_max (gssize *ssize)
 void
 gi_marshalling_tests_ssize_out_min (gssize *ssize)
 {
-    *ssize = G_MINSSIZE;
+  *ssize = G_MINSSIZE;
 }
 
 /**
@@ -837,8 +837,8 @@ gi_marshalling_tests_ssize_out_min (gssize *ssize)
 void
 gi_marshalling_tests_ssize_inout_max_min (gssize *ssize)
 {
-    g_assert_cmpint(*ssize, ==, G_MAXSSIZE);
-    *ssize = G_MINSSIZE;
+  g_assert_cmpint (*ssize, ==, G_MAXSSIZE);
+  *ssize = G_MINSSIZE;
 }
 
 /**
@@ -848,21 +848,21 @@ gi_marshalling_tests_ssize_inout_max_min (gssize *ssize)
 void
 gi_marshalling_tests_ssize_inout_min_max (gssize *ssize)
 {
-    g_assert_cmpint(*ssize, ==, G_MINSSIZE);
-    *ssize = G_MAXSSIZE;
+  g_assert_cmpint (*ssize, ==, G_MINSSIZE);
+  *ssize = G_MAXSSIZE;
 }
 
 
 gsize
 gi_marshalling_tests_size_return (void)
 {
-    return G_MAXSIZE;
+  return G_MAXSIZE;
 }
 
 void
 gi_marshalling_tests_size_in (gsize size)
 {
-    g_assert_cmpuint(size, ==, G_MAXSIZE);
+  g_assert_cmpuint (size, ==, G_MAXSIZE);
 }
 
 /**
@@ -872,7 +872,7 @@ gi_marshalling_tests_size_in (gsize size)
 void
 gi_marshalling_tests_size_out (gsize *size)
 {
-    *size = G_MAXSIZE;
+  *size = G_MAXSIZE;
 }
 
 /**
@@ -882,21 +882,21 @@ gi_marshalling_tests_size_out (gsize *size)
 void
 gi_marshalling_tests_size_inout (gsize *size)
 {
-    g_assert_cmpuint(*size, ==, G_MAXSIZE);
-    *size = 0;
+  g_assert_cmpuint (*size, ==, G_MAXSIZE);
+  *size = 0;
 }
 
 
 gfloat
 gi_marshalling_tests_float_return (void)
 {
-    return G_MAXFLOAT;
+  return G_MAXFLOAT;
 }
 
 void
 gi_marshalling_tests_float_in (gfloat v)
 {
-    g_assert_cmpfloat(v, ==, G_MAXFLOAT);
+  g_assert_cmpfloat (v, ==, G_MAXFLOAT);
 }
 
 /**
@@ -906,7 +906,7 @@ gi_marshalling_tests_float_in (gfloat v)
 void
 gi_marshalling_tests_float_out (gfloat *v)
 {
-    *v = G_MAXFLOAT;
+  *v = G_MAXFLOAT;
 }
 
 /**
@@ -916,21 +916,21 @@ gi_marshalling_tests_float_out (gfloat *v)
 void
 gi_marshalling_tests_float_inout (gfloat *v)
 {
-    g_assert_cmpfloat(*v, ==, G_MAXFLOAT);
-    *v = G_MINFLOAT;
+  g_assert_cmpfloat (*v, ==, G_MAXFLOAT);
+  *v = G_MINFLOAT;
 }
 
 
 gdouble
 gi_marshalling_tests_double_return (void)
 {
-    return G_MAXDOUBLE;
+  return G_MAXDOUBLE;
 }
 
 void
 gi_marshalling_tests_double_in (gdouble v)
 {
-    g_assert_cmpfloat(v, ==, G_MAXDOUBLE);
+  g_assert_cmpfloat (v, ==, G_MAXDOUBLE);
 }
 
 /**
@@ -940,7 +940,7 @@ gi_marshalling_tests_double_in (gdouble v)
 void
 gi_marshalling_tests_double_out (gdouble *v)
 {
-    *v = G_MAXDOUBLE;
+  *v = G_MAXDOUBLE;
 }
 
 /**
@@ -950,21 +950,21 @@ gi_marshalling_tests_double_out (gdouble *v)
 void
 gi_marshalling_tests_double_inout (gdouble *v)
 {
-    g_assert_cmpfloat(*v, ==, G_MAXDOUBLE);
-    *v = G_MINDOUBLE;
+  g_assert_cmpfloat (*v, ==, G_MAXDOUBLE);
+  *v = G_MINDOUBLE;
 }
 
 
 time_t
 gi_marshalling_tests_time_t_return (void)
 {
-    return 1234567890;
+  return 1234567890;
 }
 
 void
 gi_marshalling_tests_time_t_in (time_t v)
 {
-    g_assert_cmpuint(v, ==, 1234567890);
+  g_assert_cmpuint (v, ==, 1234567890);
 }
 
 /**
@@ -974,7 +974,7 @@ gi_marshalling_tests_time_t_in (time_t v)
 void
 gi_marshalling_tests_time_t_out (time_t *v)
 {
-    *v = 1234567890;
+  *v = 1234567890;
 }
 
 /**
@@ -984,33 +984,33 @@ gi_marshalling_tests_time_t_out (time_t *v)
 void
 gi_marshalling_tests_time_t_inout (time_t *v)
 {
-    g_assert_cmpuint(*v, ==, 1234567890);
-    *v = 0;
+  g_assert_cmpuint (*v, ==, 1234567890);
+  *v = 0;
 }
 
 
 GType
 gi_marshalling_tests_gtype_return (void)
 {
-    return G_TYPE_NONE;
+  return G_TYPE_NONE;
 }
 
 GType
 gi_marshalling_tests_gtype_string_return (void)
 {
-    return G_TYPE_STRING;
+  return G_TYPE_STRING;
 }
 
 void
 gi_marshalling_tests_gtype_in (GType gtype)
 {
-    g_assert(gtype == G_TYPE_NONE);
+  g_assert (gtype == G_TYPE_NONE);
 }
 
 void
 gi_marshalling_tests_gtype_string_in (GType gtype)
 {
-    g_assert(gtype == G_TYPE_STRING);
+  g_assert (gtype == G_TYPE_STRING);
 }
 
 
@@ -1021,7 +1021,7 @@ gi_marshalling_tests_gtype_string_in (GType gtype)
 void
 gi_marshalling_tests_gtype_out (GType *gtype)
 {
-    *gtype = G_TYPE_NONE;
+  *gtype = G_TYPE_NONE;
 }
 
 /**
@@ -1031,7 +1031,7 @@ gi_marshalling_tests_gtype_out (GType *gtype)
 void
 gi_marshalling_tests_gtype_string_out (GType *gtype)
 {
-    *gtype = G_TYPE_STRING;
+  *gtype = G_TYPE_STRING;
 }
 
 /**
@@ -1041,27 +1041,27 @@ gi_marshalling_tests_gtype_string_out (GType *gtype)
 void
 gi_marshalling_tests_gtype_inout (GType *gtype)
 {
-    g_assert(*gtype == G_TYPE_NONE);
-    *gtype = G_TYPE_INT;
+  g_assert (*gtype == G_TYPE_NONE);
+  *gtype = G_TYPE_INT;
 }
 
 
 const gchar *
 gi_marshalling_tests_utf8_none_return (void)
 {
-    return GI_MARSHALLING_TESTS_CONSTANT_UTF8;
+  return GI_MARSHALLING_TESTS_CONSTANT_UTF8;
 }
 
 gchar *
 gi_marshalling_tests_utf8_full_return (void)
 {
-    return g_strdup(GI_MARSHALLING_TESTS_CONSTANT_UTF8);
+  return g_strdup (GI_MARSHALLING_TESTS_CONSTANT_UTF8);
 }
 
 void
 gi_marshalling_tests_utf8_none_in (const gchar *utf8)
 {
-    g_assert_cmpstr(GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, utf8);
+  g_assert_cmpstr (GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, utf8);
 }
 
 /**
@@ -1074,8 +1074,7 @@ gi_marshalling_tests_utf8_none_in (const gchar *utf8)
  * UTF-16) to UTF-8.
  */
 void
-gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array,
-                                            gsize         len)
+gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array, gsize len)
 {
   gsize orig_len = strlen (GI_MARSHALLING_TESTS_CONSTANT_UTF8);
   g_assert_cmpint (orig_len, ==, len);
@@ -1089,7 +1088,7 @@ gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array,
 void
 gi_marshalling_tests_utf8_none_out (gchar **utf8)
 {
-    *utf8 = GI_MARSHALLING_TESTS_CONSTANT_UTF8;
+  *utf8 = GI_MARSHALLING_TESTS_CONSTANT_UTF8;
 }
 
 /**
@@ -1099,7 +1098,7 @@ gi_marshalling_tests_utf8_none_out (gchar **utf8)
 void
 gi_marshalling_tests_utf8_full_out (gchar **utf8)
 {
-    *utf8 = g_strdup(GI_MARSHALLING_TESTS_CONSTANT_UTF8);
+  *utf8 = g_strdup (GI_MARSHALLING_TESTS_CONSTANT_UTF8);
 }
 
 /**
@@ -1109,11 +1108,11 @@ gi_marshalling_tests_utf8_full_out (gchar **utf8)
 void
 gi_marshalling_tests_utf8_dangling_out (gchar **utf8)
 {
-    /* Intentionally don't touch the pointer to see how
-       the bindings handle this case.  Bindings should be
-       robust against broken C functions and can initialize
-       even OUT vlues to NULL.
-    */
+  /* Intentionally don't touch the pointer to see how
+     the bindings handle this case.  Bindings should be
+     robust against broken C functions and can initialize
+     even OUT vlues to NULL.
+   */
 }
 
 /**
@@ -1123,8 +1122,8 @@ gi_marshalling_tests_utf8_dangling_out (gchar **utf8)
 void
 gi_marshalling_tests_utf8_none_inout (gchar **utf8)
 {
-    g_assert_cmpstr(GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8);
-    *utf8 = "";
+  g_assert_cmpstr (GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8);
+  *utf8 = "";
 }
 
 /**
@@ -1134,9 +1133,9 @@ gi_marshalling_tests_utf8_none_inout (gchar **utf8)
 void
 gi_marshalling_tests_utf8_full_inout (gchar **utf8)
 {
-    g_assert_cmpstr(GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8);
-    g_free(*utf8);
-    *utf8 = g_strdup("");
+  g_assert_cmpstr (GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8);
+  g_free (*utf8);
+  *utf8 = g_strdup ("");
 }
 
 
@@ -1150,15 +1149,15 @@ gi_marshalling_tests_utf8_full_inout (gchar **utf8)
 gboolean
 gi_marshalling_tests_init_function (gint *n_args, char ***argv)
 {
-    if (n_args == NULL)
-	return TRUE;
+  if (n_args == NULL)
+    return TRUE;
 
-    if (*n_args == 0)
-	return TRUE;
-    (*n_args)--;
-    g_assert (argv != NULL);
-    (*argv)[*n_args] = NULL;
+  if (*n_args == 0)
     return TRUE;
+  (*n_args)--;
+  g_assert (argv != NULL);
+  (*argv)[*n_args] = NULL;
+  return TRUE;
 }
 
 /**
@@ -1169,8 +1168,8 @@ gi_marshalling_tests_init_function (gint *n_args, char ***argv)
 const gint *
 gi_marshalling_tests_array_fixed_int_return (void)
 {
-    static gint ints[] = {-1, 0, 1, 2};
-    return ints;
+  static gint ints[] = { -1, 0, 1, 2 };
+  return ints;
 }
 
 /**
@@ -1181,8 +1180,8 @@ gi_marshalling_tests_array_fixed_int_return (void)
 const gshort *
 gi_marshalling_tests_array_fixed_short_return (void)
 {
-    static gshort shorts[] = {-1, 0, 1, 2};
-    return shorts;
+  static gshort shorts[] = { -1, 0, 1, 2 };
+  return shorts;
 }
 
 /**
@@ -1192,10 +1191,10 @@ gi_marshalling_tests_array_fixed_short_return (void)
 void
 gi_marshalling_tests_array_fixed_int_in (const gint *ints)
 {
-    g_assert_cmpint(ints[0], ==, -1);
-    g_assert_cmpint(ints[1], ==, 0);
-    g_assert_cmpint(ints[2], ==, 1);
-    g_assert_cmpint(ints[3], ==, 2);
+  g_assert_cmpint (ints[0], ==, -1);
+  g_assert_cmpint (ints[1], ==, 0);
+  g_assert_cmpint (ints[2], ==, 1);
+  g_assert_cmpint (ints[3], ==, 2);
 }
 
 /**
@@ -1205,10 +1204,10 @@ gi_marshalling_tests_array_fixed_int_in (const gint *ints)
 void
 gi_marshalling_tests_array_fixed_short_in (const gshort *shorts)
 {
-    g_assert_cmpint(shorts[0], ==, -1);
-    g_assert_cmpint(shorts[1], ==, 0);
-    g_assert_cmpint(shorts[2], ==, 1);
-    g_assert_cmpint(shorts[3], ==, 2);
+  g_assert_cmpint (shorts[0], ==, -1);
+  g_assert_cmpint (shorts[1], ==, 0);
+  g_assert_cmpint (shorts[2], ==, 1);
+  g_assert_cmpint (shorts[3], ==, 2);
 }
 
 /**
@@ -1218,8 +1217,8 @@ gi_marshalling_tests_array_fixed_short_in (const gshort *shorts)
 void
 gi_marshalling_tests_array_fixed_out (gint **ints)
 {
-    static gint values[] = {-1, 0, 1, 2};
-    *ints = values;
+  static gint values[] = { -1, 0, 1, 2 };
+  *ints = values;
 }
 
 /**
@@ -1229,19 +1228,20 @@ gi_marshalling_tests_array_fixed_out (gint **ints)
 void
 gi_marshalling_tests_array_fixed_out_struct (GIMarshallingTestsSimpleStruct **structs)
 {
-    static GIMarshallingTestsSimpleStruct *values;
+  static GIMarshallingTestsSimpleStruct *values;
 
-    if (values == NULL) {
-        values = g_new(GIMarshallingTestsSimpleStruct, 2);
+  if (values == NULL)
+    {
+      values = g_new (GIMarshallingTestsSimpleStruct, 2);
 
-        values[0].long_ = 7;
-        values[0].int8 = 6;
+      values[0].long_ = 7;
+      values[0].int8 = 6;
 
-        values[1].long_ = 6;
-        values[1].int8 = 7;
+      values[1].long_ = 6;
+      values[1].int8 = 7;
     }
 
-    *structs = values;
+  *structs = values;
 }
 
 /**
@@ -1251,14 +1251,14 @@ gi_marshalling_tests_array_fixed_out_struct (GIMarshallingTestsSimpleStruct **st
 void
 gi_marshalling_tests_array_fixed_inout (gint **ints)
 {
-    static gint values[] = {2, 1, 0, -1};
+  static gint values[] = { 2, 1, 0, -1 };
 
-    g_assert_cmpint((*ints)[0], ==, -1);
-    g_assert_cmpint((*ints)[1], ==, 0);
-    g_assert_cmpint((*ints)[2], ==, 1);
-    g_assert_cmpint((*ints)[3], ==, 2);
+  g_assert_cmpint ((*ints)[0], ==, -1);
+  g_assert_cmpint ((*ints)[1], ==, 0);
+  g_assert_cmpint ((*ints)[2], ==, 1);
+  g_assert_cmpint ((*ints)[3], ==, 2);
 
-    *ints = values;
+  *ints = values;
 }
 
 
@@ -1270,10 +1270,10 @@ gi_marshalling_tests_array_fixed_inout (gint **ints)
 const gint *
 gi_marshalling_tests_array_return (gint *length)
 {
-    static gint ints[] = {-1, 0, 1, 2};
+  static gint ints[] = { -1, 0, 1, 2 };
 
-    *length = 4;
-    return ints;
+  *length = 4;
+  return ints;
 }
 
 /**
@@ -1288,13 +1288,13 @@ gi_marshalling_tests_array_return (gint *length)
 const gint *
 gi_marshalling_tests_array_return_etc (gint first, gint *length, gint last, gint *sum)
 {
-    static gint ints[] = {-1, 0, 1, 2};
+  static gint ints[] = { -1, 0, 1, 2 };
 
-    ints[0] = first;
-    ints[3] = last;
-    *sum = first + last;
-    *length = 4;
-    return ints;
+  ints[0] = first;
+  ints[3] = last;
+  *sum = first + last;
+  *length = 4;
+  return ints;
 }
 
 /**
@@ -1305,11 +1305,11 @@ gi_marshalling_tests_array_return_etc (gint first, gint *length, gint last, gint
 void
 gi_marshalling_tests_array_in (const gint *ints, gint length)
 {
-    g_assert_cmpint(length, ==, 4);
-    g_assert_cmpint(ints[0], ==, -1);
-    g_assert_cmpint(ints[1], ==, 0);
-    g_assert_cmpint(ints[2], ==, 1);
-    g_assert_cmpint(ints[3], ==, 2);
+  g_assert_cmpint (length, ==, 4);
+  g_assert_cmpint (ints[0], ==, -1);
+  g_assert_cmpint (ints[1], ==, 0);
+  g_assert_cmpint (ints[2], ==, 1);
+  g_assert_cmpint (ints[3], ==, 2);
 }
 
 /**
@@ -1320,7 +1320,7 @@ gi_marshalling_tests_array_in (const gint *ints, gint length)
 void
 gi_marshalling_tests_array_in_len_before (gint length, const gint *ints)
 {
-    gi_marshalling_tests_array_in (ints, length);
+  gi_marshalling_tests_array_in (ints, length);
 }
 
 /**
@@ -1331,15 +1331,15 @@ gi_marshalling_tests_array_in_len_before (gint length, const gint *ints)
 void
 gi_marshalling_tests_array_in_len_zero_terminated (const gint *ints, gint length)
 {
-    g_assert_cmpint(length, ==, 4);
+  g_assert_cmpint (length, ==, 4);
 
-    g_assert_cmpint(ints[0], ==, -1);
-    g_assert_cmpint(ints[1], ==, 0);
-    g_assert_cmpint(ints[2], ==, 1);
-    g_assert_cmpint(ints[3], ==, 2);
+  g_assert_cmpint (ints[0], ==, -1);
+  g_assert_cmpint (ints[1], ==, 0);
+  g_assert_cmpint (ints[2], ==, 1);
+  g_assert_cmpint (ints[3], ==, 2);
 
-    /* One past the end, null terminator */
-    g_assert_cmpint(ints[4], ==, 0);
+  /* One past the end, null terminator */
+  g_assert_cmpint (ints[4], ==, 0);
 }
 
 /**
@@ -1349,9 +1349,9 @@ gi_marshalling_tests_array_in_len_zero_terminated (const gint *ints, gint length
 void
 gi_marshalling_tests_array_string_in (const gchar **strings, gint length)
 {
-    g_assert_cmpint(length, ==, 2);
-    g_assert_cmpstr(strings[0], ==, "foo");
-    g_assert_cmpstr(strings[1], ==, "bar");
+  g_assert_cmpint (length, ==, 2);
+  g_assert_cmpstr (strings[0], ==, "foo");
+  g_assert_cmpstr (strings[1], ==, "bar");
 }
 
 /**
@@ -1361,11 +1361,11 @@ gi_marshalling_tests_array_string_in (const gchar **strings, gint length)
 void
 gi_marshalling_tests_array_uint8_in (const guint8 *chars, gint length)
 {
-    g_assert_cmpint(length, ==, 4);
-    g_assert(chars[0] == 'a');
-    g_assert(chars[1] == 'b');
-    g_assert(chars[2] == 'c');
-    g_assert(chars[3] == 'd');
+  g_assert_cmpint (length, ==, 4);
+  g_assert (chars[0] == 'a');
+  g_assert (chars[1] == 'b');
+  g_assert (chars[2] == 'c');
+  g_assert (chars[3] == 'd');
 }
 
 /**
@@ -1375,10 +1375,10 @@ gi_marshalling_tests_array_uint8_in (const guint8 *chars, gint length)
 void
 gi_marshalling_tests_array_struct_in (GIMarshallingTestsBoxedStruct **structs, gint length)
 {
-    g_assert_cmpint(length, ==, 3);
-    g_assert_cmpint(structs[0]->long_, ==, 1);
-    g_assert_cmpint(structs[1]->long_, ==, 2);
-    g_assert_cmpint(structs[2]->long_, ==, 3);
+  g_assert_cmpint (length, ==, 3);
+  g_assert_cmpint (structs[0]->long_, ==, 1);
+  g_assert_cmpint (structs[1]->long_, ==, 2);
+  g_assert_cmpint (structs[2]->long_, ==, 3);
 }
 
 /**
@@ -1388,10 +1388,10 @@ gi_marshalling_tests_array_struct_in (GIMarshallingTestsBoxedStruct **structs, g
 void
 gi_marshalling_tests_array_struct_value_in (GIMarshallingTestsBoxedStruct *structs, gint length)
 {
-    g_assert_cmpint(length, ==, 3);
-    g_assert_cmpint(structs[0].long_, ==, 1);
-    g_assert_cmpint(structs[1].long_, ==, 2);
-    g_assert_cmpint(structs[2].long_, ==, 3);
+  g_assert_cmpint (length, ==, 3);
+  g_assert_cmpint (structs[0].long_, ==, 1);
+  g_assert_cmpint (structs[1].long_, ==, 2);
+  g_assert_cmpint (structs[2].long_, ==, 3);
 }
 
 /**
@@ -1401,10 +1401,10 @@ gi_marshalling_tests_array_struct_value_in (GIMarshallingTestsBoxedStruct *struc
 void
 gi_marshalling_tests_array_simple_struct_in (GIMarshallingTestsSimpleStruct *structs, gint length)
 {
-    g_assert_cmpint(length, ==, 3);
-    g_assert_cmpint(structs[0].long_, ==, 1);
-    g_assert_cmpint(structs[1].long_, ==, 2);
-    g_assert_cmpint(structs[2].long_, ==, 3);
+  g_assert_cmpint (length, ==, 3);
+  g_assert_cmpint (structs[0].long_, ==, 1);
+  g_assert_cmpint (structs[1].long_, ==, 2);
+  g_assert_cmpint (structs[2].long_, ==, 3);
 }
 
 /**
@@ -1415,13 +1415,13 @@ gi_marshalling_tests_array_simple_struct_in (GIMarshallingTestsSimpleStruct *str
 void
 gi_marshalling_tests_multi_array_key_value_in (gint length, const gchar **keys, const GValue *values)
 {
-    g_assert_cmpint(length, ==, 3);
-    g_assert_cmpstr("one", ==, keys[0]);
-    g_assert_cmpint(g_value_get_int(&values[0]), ==, 1);
-    g_assert_cmpstr("two", ==, keys[1]);
-    g_assert_cmpint(g_value_get_int(&values[1]), ==, 2);
-    g_assert_cmpstr("three", ==, keys[2]);
-    g_assert_cmpint(g_value_get_int(&values[2]), ==, 3);
+  g_assert_cmpint (length, ==, 3);
+  g_assert_cmpstr ("one", ==, keys[0]);
+  g_assert_cmpint (g_value_get_int (&values[0]), ==, 1);
+  g_assert_cmpstr ("two", ==, keys[1]);
+  g_assert_cmpint (g_value_get_int (&values[1]), ==, 2);
+  g_assert_cmpstr ("three", ==, keys[2]);
+  g_assert_cmpint (g_value_get_int (&values[2]), ==, 3);
 
 }
 
@@ -1432,13 +1432,13 @@ gi_marshalling_tests_multi_array_key_value_in (gint length, const gchar **keys,
 void
 gi_marshalling_tests_array_struct_take_in (GIMarshallingTestsBoxedStruct **structs, gint length)
 {
-    gi_marshalling_tests_array_struct_in (structs, length);
+  gi_marshalling_tests_array_struct_in (structs, length);
 
-    /* only really useful if run in valgrind actually */
-    gi_marshalling_tests_boxed_struct_free (structs[0]);
-    gi_marshalling_tests_boxed_struct_free (structs[1]);
-    gi_marshalling_tests_boxed_struct_free (structs[2]);
-    g_free (structs);
+  /* only really useful if run in valgrind actually */
+  gi_marshalling_tests_boxed_struct_free (structs[0]);
+  gi_marshalling_tests_boxed_struct_free (structs[1]);
+  gi_marshalling_tests_boxed_struct_free (structs[2]);
+  g_free (structs);
 }
 
 /**
@@ -1449,10 +1449,10 @@ gi_marshalling_tests_array_struct_take_in (GIMarshallingTestsBoxedStruct **struc
 void
 gi_marshalling_tests_array_enum_in (GIMarshallingTestsEnum *v, gint length)
 {
-    g_assert_cmpint(length, ==, 3);
-    g_assert_cmpint(v[0], ==, GI_MARSHALLING_TESTS_ENUM_VALUE1);
-    g_assert_cmpint(v[1], ==, GI_MARSHALLING_TESTS_ENUM_VALUE2);
-    g_assert_cmpint(v[2], ==, GI_MARSHALLING_TESTS_ENUM_VALUE3);
+  g_assert_cmpint (length, ==, 3);
+  g_assert_cmpint (v[0], ==, GI_MARSHALLING_TESTS_ENUM_VALUE1);
+  g_assert_cmpint (v[1], ==, GI_MARSHALLING_TESTS_ENUM_VALUE2);
+  g_assert_cmpint (v[2], ==, GI_MARSHALLING_TESTS_ENUM_VALUE3);
 }
 
 /**
@@ -1463,9 +1463,9 @@ gi_marshalling_tests_array_enum_in (GIMarshallingTestsEnum *v, gint length)
 void
 gi_marshalling_tests_array_in_guint64_len (const gint *ints, guint64 length)
 {
-    g_assert_cmpint(length, ==, 4);
+  g_assert_cmpint (length, ==, 4);
 
-    gi_marshalling_tests_array_in (ints, length);
+  gi_marshalling_tests_array_in (ints, length);
 }
 
 /**
@@ -1476,9 +1476,9 @@ gi_marshalling_tests_array_in_guint64_len (const gint *ints, guint64 length)
 void
 gi_marshalling_tests_array_in_guint8_len (const gint *ints, guint8 length)
 {
-    g_assert_cmpint(length, ==, 4);
+  g_assert_cmpint (length, ==, 4);
 
-    gi_marshalling_tests_array_in (ints, length);
+  gi_marshalling_tests_array_in (ints, length);
 }
 
 /**
@@ -1488,10 +1488,10 @@ gi_marshalling_tests_array_in_guint8_len (const gint *ints, guint8 length)
 void
 gi_marshalling_tests_array_out (gint **ints, gint *length)
 {
-    static gint values[] = {-1, 0, 1, 2};
+  static gint values[] = { -1, 0, 1, 2 };
 
-    *length = 4;
-    *ints = values;
+  *length = 4;
+  *ints = values;
 }
 
 /**
@@ -1505,13 +1505,13 @@ gi_marshalling_tests_array_out (gint **ints, gint *length)
 void
 gi_marshalling_tests_array_out_etc (gint first, gint **ints, gint *length, gint last, gint *sum)
 {
-    static gint values[] = {-1, 0, 1, 2};
+  static gint values[] = { -1, 0, 1, 2 };
 
-    values[0] = first;
-    values[3] = last;
-    *sum = first + last;
-    *length = 4;
-    *ints = values;
+  values[0] = first;
+  values[3] = last;
+  *sum = first + last;
+  *length = 4;
+  *ints = values;
 }
 
 /**
@@ -1522,16 +1522,16 @@ gi_marshalling_tests_array_out_etc (gint first, gint **ints, gint *length, gint
 void
 gi_marshalling_tests_array_inout (gint **ints, gint *length)
 {
-    static gint values[] = {-2, -1, 0, 1, 2};
+  static gint values[] = { -2, -1, 0, 1, 2 };
 
-    g_assert_cmpint(*length, ==, 4);
-    g_assert_cmpint((*ints)[0], ==, -1);
-    g_assert_cmpint((*ints)[1], ==, 0);
-    g_assert_cmpint((*ints)[2], ==, 1);
-    g_assert_cmpint((*ints)[3], ==, 2);
+  g_assert_cmpint (*length, ==, 4);
+  g_assert_cmpint ((*ints)[0], ==, -1);
+  g_assert_cmpint ((*ints)[1], ==, 0);
+  g_assert_cmpint ((*ints)[2], ==, 1);
+  g_assert_cmpint ((*ints)[3], ==, 2);
 
-    *length = 5;
-    *ints = values;
+  *length = 5;
+  *ints = values;
 }
 
 /**
@@ -1545,19 +1545,19 @@ gi_marshalling_tests_array_inout (gint **ints, gint *length)
 void
 gi_marshalling_tests_array_inout_etc (gint first, gint **ints, gint *length, gint last, gint *sum)
 {
-    static gint values[] = {-2, -1, 0, 1, 2};
+  static gint values[] = { -2, -1, 0, 1, 2 };
 
-    g_assert_cmpint(*length, ==, 4);
-    g_assert_cmpint((*ints)[0], ==, -1);
-    g_assert_cmpint((*ints)[1], ==, 0);
-    g_assert_cmpint((*ints)[2], ==, 1);
-    g_assert_cmpint((*ints)[3], ==, 2);
+  g_assert_cmpint (*length, ==, 4);
+  g_assert_cmpint ((*ints)[0], ==, -1);
+  g_assert_cmpint ((*ints)[1], ==, 0);
+  g_assert_cmpint ((*ints)[2], ==, 1);
+  g_assert_cmpint ((*ints)[3], ==, 2);
 
-    values[0] = first;
-    values[4] = last;
-    *sum = first + last;
-    *length = 5;
-    *ints = values;
+  values[0] = first;
+  values[4] = last;
+  *sum = first + last;
+  *length = 5;
+  *ints = values;
 }
 
 /**
@@ -1568,10 +1568,10 @@ gi_marshalling_tests_array_inout_etc (gint first, gint **ints, gint *length, gin
 void
 gi_marshalling_tests_array_in_nonzero_nonlen (gint first, const guint8 *chars)
 {
-    g_assert(chars[0] == 'a');
-    g_assert(chars[1] == 'b');
-    g_assert(chars[2] == 'c');
-    g_assert(chars[3] == 'd');
+  g_assert (chars[0] == 'a');
+  g_assert (chars[1] == 'b');
+  g_assert (chars[2] == 'c');
+  g_assert (chars[3] == 'd');
 }
 
 /**
@@ -1582,8 +1582,8 @@ gi_marshalling_tests_array_in_nonzero_nonlen (gint first, const guint8 *chars)
 gchar **
 gi_marshalling_tests_array_zero_terminated_return (void)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    return values;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  return values;
 }
 
 /**
@@ -1594,7 +1594,7 @@ gi_marshalling_tests_array_zero_terminated_return (void)
 gchar **
 gi_marshalling_tests_array_zero_terminated_return_null (void)
 {
-    return NULL;
+  return NULL;
 }
 
 /**
@@ -1605,20 +1605,20 @@ gi_marshalling_tests_array_zero_terminated_return_null (void)
 GIMarshallingTestsBoxedStruct **
 gi_marshalling_tests_array_zero_terminated_return_struct (void)
 {
-    GIMarshallingTestsBoxedStruct **ret = (GIMarshallingTestsBoxedStruct**) g_new (gpointer, 4);
+  GIMarshallingTestsBoxedStruct **ret = (GIMarshallingTestsBoxedStruct **) g_new (gpointer, 4);
 
-    ret[0] = gi_marshalling_tests_boxed_struct_new ();
-    ret[0]->long_ = 42;
+  ret[0] = gi_marshalling_tests_boxed_struct_new ();
+  ret[0]->long_ = 42;
 
-    ret[1] = gi_marshalling_tests_boxed_struct_new ();
-    ret[1]->long_ = 43;
+  ret[1] = gi_marshalling_tests_boxed_struct_new ();
+  ret[1]->long_ = 43;
 
-    ret[2] = gi_marshalling_tests_boxed_struct_new ();
-    ret[2]->long_ = 44;
+  ret[2] = gi_marshalling_tests_boxed_struct_new ();
+  ret[2]->long_ = 44;
 
-    ret[3] = NULL;
+  ret[3] = NULL;
 
-    return ret;
+  return ret;
 }
 
 /**
@@ -1628,10 +1628,10 @@ gi_marshalling_tests_array_zero_terminated_return_struct (void)
 void
 gi_marshalling_tests_array_zero_terminated_in (gchar **utf8s)
 {
-    g_assert(g_strv_length(utf8s));
-    g_assert_cmpstr(utf8s[0], ==, "0");
-    g_assert_cmpstr(utf8s[1], ==, "1");
-    g_assert_cmpstr(utf8s[2], ==, "2");
+  g_assert (g_strv_length (utf8s));
+  g_assert_cmpstr (utf8s[0], ==, "0");
+  g_assert_cmpstr (utf8s[1], ==, "1");
+  g_assert_cmpstr (utf8s[2], ==, "2");
 }
 
 /**
@@ -1639,10 +1639,10 @@ gi_marshalling_tests_array_zero_terminated_in (gchar **utf8s)
  * @utf8s: (out) (array zero-terminated=1) (transfer none):
  */
 void
-gi_marshalling_tests_array_zero_terminated_out (gchar ***utf8s)
+gi_marshalling_tests_array_zero_terminated_out (gchar *** utf8s)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    *utf8s = values;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  *utf8s = values;
 }
 
 /**
@@ -1650,16 +1650,16 @@ gi_marshalling_tests_array_zero_terminated_out (gchar ***utf8s)
  * @utf8s: (inout) (array zero-terminated=1) (transfer none):
  */
 void
-gi_marshalling_tests_array_zero_terminated_inout (gchar ***utf8s)
+gi_marshalling_tests_array_zero_terminated_inout (gchar *** utf8s)
 {
-    static gchar *values[] = {"-1", "0", "1", "2", NULL};
+  static gchar *values[] = { "-1", "0", "1", "2", NULL };
 
-    g_assert(g_strv_length(*utf8s));
-    g_assert_cmpstr((*utf8s)[0], ==, "0");
-    g_assert_cmpstr((*utf8s)[1], ==, "1");
-    g_assert_cmpstr((*utf8s)[2], ==, "2");
+  g_assert (g_strv_length (*utf8s));
+  g_assert_cmpstr ((*utf8s)[0], ==, "0");
+  g_assert_cmpstr ((*utf8s)[1], ==, "1");
+  g_assert_cmpstr ((*utf8s)[2], ==, "2");
 
-    *utf8s = values;
+  *utf8s = values;
 }
 
 /**
@@ -1671,20 +1671,21 @@ gi_marshalling_tests_array_zero_terminated_inout (gchar ***utf8s)
 GVariant **
 gi_marshalling_tests_array_gvariant_none_in (GVariant **variants)
 {
-    /* Use a static container to detect if someone tries to free it */
-    static GVariant *private_container[3] = { NULL, NULL, NULL };
-    
-    if (private_container[0] == NULL) {
+  /* Use a static container to detect if someone tries to free it */
+  static GVariant *private_container[3] = { NULL, NULL, NULL };
+
+  if (private_container[0] == NULL)
+    {
       private_container[0] = g_variant_new_int32 (27);
       private_container[1] = g_variant_new_string ("Hello");
     }
 
-    g_assert (variants != NULL);
-    g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27);
-    g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello");
-    g_assert (variants[2] == NULL);
+  g_assert (variants != NULL);
+  g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27);
+  g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello");
+  g_assert (variants[2] == NULL);
 
-    return private_container;
+  return private_container;
 }
 
 /**
@@ -1696,19 +1697,19 @@ gi_marshalling_tests_array_gvariant_none_in (GVariant **variants)
 GVariant **
 gi_marshalling_tests_array_gvariant_container_in (GVariant **variants)
 {
-    GVariant **container;
+  GVariant **container;
+
+  g_assert (variants != NULL);
+  g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27);
+  g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello");
+  g_assert (variants[2] == NULL);
 
-    g_assert (variants != NULL);
-    g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27);
-    g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello");
-    g_assert (variants[2] == NULL);
-    
-    container = g_new0 (GVariant*, 3);
-    container[0] = variants[0];
-    container[1] = variants[1];
-    g_free (variants);
-    
-    return container;
+  container = g_new0 (GVariant *, 3);
+  container[0] = variants[0];
+  container[1] = variants[1];
+  g_free (variants);
+
+  return container;
 }
 
 /**
@@ -1720,23 +1721,23 @@ gi_marshalling_tests_array_gvariant_container_in (GVariant **variants)
 GVariant **
 gi_marshalling_tests_array_gvariant_full_in (GVariant **variants)
 {
-    GVariant **container;
+  GVariant **container;
+
+  g_assert (variants != NULL);
+  g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27);
+  g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello");
+  g_assert (variants[2] == NULL);
 
-    g_assert (variants != NULL);
-    g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27);
-    g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello");
-    g_assert (variants[2] == NULL);
-    
-    /* To catch different behaviors we reconstruct one variant from scratch,
-     * while leaving the other untouched. Both approaches are legal with full
-     * transfer in and out */
-    container = g_new0 (GVariant*, 3);
-    container[0] = g_variant_new_int32 (g_variant_get_int32 (variants[0]));
-    g_variant_unref (variants[0]);
-    container[1] = variants[1];
-    g_free (variants);
+  /* To catch different behaviors we reconstruct one variant from scratch,
+   * while leaving the other untouched. Both approaches are legal with full
+   * transfer in and out */
+  container = g_new0 (GVariant *, 3);
+  container[0] = g_variant_new_int32 (g_variant_get_int32 (variants[0]));
+  g_variant_unref (variants[0]);
+  container[1] = variants[1];
+  g_free (variants);
 
-    return container;
+  return container;
 }
 
 /**
@@ -1747,16 +1748,17 @@ gi_marshalling_tests_array_gvariant_full_in (GVariant **variants)
 GArray *
 gi_marshalling_tests_garray_int_none_return (void)
 {
-    static GArray *v = NULL;
-    gint i;
+  static GArray *v = NULL;
+  gint i;
 
-    if (v == NULL) {
-        v = g_array_new (TRUE, TRUE, sizeof (gint));
-        for (i = -1; i < 3; i++)
-            g_array_append_val (v, i);
+  if (v == NULL)
+    {
+      v = g_array_new (TRUE, TRUE, sizeof (gint));
+      for (i = -1; i < 3; i++)
+        g_array_append_val (v, i);
     }
 
-    return v;
+  return v;
 }
 
 /**
@@ -1767,18 +1769,19 @@ gi_marshalling_tests_garray_int_none_return (void)
 GArray *
 gi_marshalling_tests_garray_uint64_none_return (void)
 {
-    static GArray *array = NULL;
-    guint64 i;
+  static GArray *array = NULL;
+  guint64 i;
 
-    if (array == NULL) {
-        array = g_array_new (TRUE, TRUE, sizeof (guint64));
-        i = 0;
-        g_array_append_val (array, i);
-        i = G_MAXUINT64;
-        g_array_append_val (array, i);
+  if (array == NULL)
+    {
+      array = g_array_new (TRUE, TRUE, sizeof (guint64));
+      i = 0;
+      g_array_append_val (array, i);
+      i = G_MAXUINT64;
+      g_array_append_val (array, i);
     }
 
-    return array;
+  return array;
 }
 
 /**
@@ -1789,17 +1792,18 @@ gi_marshalling_tests_garray_uint64_none_return (void)
 GArray *
 gi_marshalling_tests_garray_utf8_none_return (void)
 {
-    static GArray *array = NULL;
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static GArray *array = NULL;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    if (array == NULL) {
-        array = g_array_new (TRUE, TRUE, sizeof (gchar *));
-        for (i = 0; values[i]; i++)
-            g_array_append_val (array, values[i]);
+  if (array == NULL)
+    {
+      array = g_array_new (TRUE, TRUE, sizeof (gchar *));
+      for (i = 0; values[i]; i++)
+        g_array_append_val (array, values[i]);
     }
 
-    return array;
+  return array;
 }
 
 /**
@@ -1810,15 +1814,15 @@ gi_marshalling_tests_garray_utf8_none_return (void)
 GArray *
 gi_marshalling_tests_garray_utf8_container_return (void)
 {
-    GArray *array = NULL;
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  GArray *array = NULL;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    array = g_array_new (TRUE, TRUE, sizeof (gchar *));
-    for (i = 0; values[i]; i++)
-        g_array_append_val (array, values[i]);
+  array = g_array_new (TRUE, TRUE, sizeof (gchar *));
+  for (i = 0; values[i]; i++)
+    g_array_append_val (array, values[i]);
 
-    return array;
+  return array;
 }
 
 /**
@@ -1829,17 +1833,18 @@ gi_marshalling_tests_garray_utf8_container_return (void)
 GArray *
 gi_marshalling_tests_garray_utf8_full_return (void)
 {
-    GArray *array = NULL;
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  GArray *array = NULL;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    array = g_array_new (TRUE, TRUE, sizeof (gchar *));
-    for (i = 0; values[i]; i++) {
-        gchar *str = g_strdup (values[i]);
-        g_array_append_val (array, str);
+  array = g_array_new (TRUE, TRUE, sizeof (gchar *));
+  for (i = 0; values[i]; i++)
+    {
+      gchar *str = g_strdup (values[i]);
+      g_array_append_val (array, str);
     }
 
-    return array;
+  return array;
 }
 
 /**
@@ -1849,11 +1854,11 @@ gi_marshalling_tests_garray_utf8_full_return (void)
 void
 gi_marshalling_tests_garray_int_none_in (GArray *array_)
 {
-    g_assert_cmpint(array_->len, ==, 4);
-    g_assert_cmpint(g_array_index (array_, gint, 0), ==, -1);
-    g_assert_cmpint(g_array_index (array_, gint, 1), ==, 0);
-    g_assert_cmpint(g_array_index (array_, gint, 2), ==, 1);
-    g_assert_cmpint(g_array_index (array_, gint, 3), ==, 2);
+  g_assert_cmpint (array_->len, ==, 4);
+  g_assert_cmpint (g_array_index (array_, gint, 0), ==, -1);
+  g_assert_cmpint (g_array_index (array_, gint, 1), ==, 0);
+  g_assert_cmpint (g_array_index (array_, gint, 2), ==, 1);
+  g_assert_cmpint (g_array_index (array_, gint, 3), ==, 2);
 }
 
 /**
@@ -1863,9 +1868,9 @@ gi_marshalling_tests_garray_int_none_in (GArray *array_)
 void
 gi_marshalling_tests_garray_uint64_none_in (GArray *array_)
 {
-    g_assert_cmpint(array_->len, ==, 2);
-    g_assert_cmpint(g_array_index (array_, guint64, 0), ==, 0);
-    g_assert_cmpint(g_array_index (array_, guint64, 1), ==, G_MAXUINT64);
+  g_assert_cmpint (array_->len, ==, 2);
+  g_assert_cmpint (g_array_index (array_, guint64, 0), ==, 0);
+  g_assert_cmpint (g_array_index (array_, guint64, 1), ==, G_MAXUINT64);
 }
 
 /**
@@ -1875,10 +1880,10 @@ gi_marshalling_tests_garray_uint64_none_in (GArray *array_)
 void
 gi_marshalling_tests_garray_utf8_none_in (GArray *array_)
 {
-    g_assert_cmpint(array_->len, ==, 3);
-    g_assert_cmpstr(g_array_index (array_, gchar*, 0), ==, "0");
-    g_assert_cmpstr(g_array_index (array_, gchar*, 1), ==, "1");
-    g_assert_cmpstr(g_array_index (array_, gchar*, 2), ==, "2");
+  g_assert_cmpint (array_->len, ==, 3);
+  g_assert_cmpstr (g_array_index (array_, gchar *, 0), ==, "0");
+  g_assert_cmpstr (g_array_index (array_, gchar *, 1), ==, "1");
+  g_assert_cmpstr (g_array_index (array_, gchar *, 2), ==, "2");
 }
 
 /**
@@ -1888,17 +1893,18 @@ gi_marshalling_tests_garray_utf8_none_in (GArray *array_)
 void
 gi_marshalling_tests_garray_utf8_none_out (GArray **array_)
 {
-    static GArray *internal = NULL;
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static GArray *internal = NULL;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    if (internal == NULL) {
-        internal = g_array_new (TRUE, TRUE, sizeof (gchar *));
-        for (i = 0; values[i]; i++)
-            g_array_append_val (internal, values[i]);
+  if (internal == NULL)
+    {
+      internal = g_array_new (TRUE, TRUE, sizeof (gchar *));
+      for (i = 0; values[i]; i++)
+        g_array_append_val (internal, values[i]);
     }
 
-    *array_ = internal;
+  *array_ = internal;
 }
 
 /**
@@ -1908,14 +1914,14 @@ gi_marshalling_tests_garray_utf8_none_out (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_container_out (GArray **array_)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    *array_ = NULL;
+  *array_ = NULL;
 
-    *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *));
-    for (i = 0; values[i]; i++)
-        g_array_append_val (*array_, values[i]);
+  *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *));
+  for (i = 0; values[i]; i++)
+    g_array_append_val (*array_, values[i]);
 }
 
 /**
@@ -1925,15 +1931,16 @@ gi_marshalling_tests_garray_utf8_container_out (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_full_out (GArray **array_)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    *array_ = NULL;
+  *array_ = NULL;
 
-    *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *));
-    for (i = 0; values[i]; i++) {
-        gchar *str = g_strdup (values[i]);
-        g_array_append_val (*array_, str);
+  *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *));
+  for (i = 0; values[i]; i++)
+    {
+      gchar *str = g_strdup (values[i]);
+      g_array_append_val (*array_, str);
     }
 }
 
@@ -1944,13 +1951,14 @@ gi_marshalling_tests_garray_utf8_full_out (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_full_out_caller_allocated (GArray *array_)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    g_array_set_size (array_, 0);
-    for (i = 0; values[i]; i++) {
-        gchar *str = g_strdup (values[i]);
-        g_array_append_val (array_, str);
+  g_array_set_size (array_, 0);
+  for (i = 0; values[i]; i++)
+    {
+      gchar *str = g_strdup (values[i]);
+      g_array_append_val (array_, str);
     }
 }
 
@@ -1961,22 +1969,23 @@ gi_marshalling_tests_garray_utf8_full_out_caller_allocated (GArray *array_)
 void
 gi_marshalling_tests_garray_utf8_none_inout (GArray **array_)
 {
-    static GArray *internal = NULL;
-    static gchar *values[] = {"-2", "-1", "0", "1", NULL};
-    gint i;
+  static GArray *internal = NULL;
+  static gchar *values[] = { "-2", "-1", "0", "1", NULL };
+  gint i;
 
-    g_assert_cmpint((*array_)->len, ==, 3);
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 0), ==, "0");
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 1), ==, "1");
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 2), ==, "2");
+  g_assert_cmpint ((*array_)->len, ==, 3);
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 0), ==, "0");
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 1), ==, "1");
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 2), ==, "2");
 
-    if (internal == NULL) {
-        internal = g_array_new (TRUE, TRUE, sizeof (gchar *));
-        for (i = 0; values[i]; i++)
-            g_array_append_val (internal, values[i]);
+  if (internal == NULL)
+    {
+      internal = g_array_new (TRUE, TRUE, sizeof (gchar *));
+      for (i = 0; values[i]; i++)
+        g_array_append_val (internal, values[i]);
     }
 
-    *array_ = internal;
+  *array_ = internal;
 }
 
 /**
@@ -1986,24 +1995,24 @@ gi_marshalling_tests_garray_utf8_none_inout (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_container_inout (GArray **array_)
 {
-    static gchar *val1 = "-2";
-    static gchar *val2 = "-1";
-    static gchar *val3 = "0";
-    static gchar *val4 = "1";
-    GArray *result;
+  static gchar *val1 = "-2";
+  static gchar *val2 = "-1";
+  static gchar *val3 = "0";
+  static gchar *val4 = "1";
+  GArray *result;
 
-    g_assert_cmpint((*array_)->len, ==, 3);
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 0), ==, "0");
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 1), ==, "1");
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 2), ==, "2");
+  g_assert_cmpint ((*array_)->len, ==, 3);
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 0), ==, "0");
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 1), ==, "1");
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 2), ==, "2");
 
-    result = g_array_new (TRUE, TRUE, sizeof (gchar *));
-    g_array_append_val (result, val1);
-    g_array_append_val (result, val2);
-    g_array_append_val (result, val3);
-    g_array_append_val (result, val4);
+  result = g_array_new (TRUE, TRUE, sizeof (gchar *));
+  g_array_append_val (result, val1);
+  g_array_append_val (result, val2);
+  g_array_append_val (result, val3);
+  g_array_append_val (result, val4);
 
-    *array_ = result;
+  *array_ = result;
 }
 
 /**
@@ -2013,27 +2022,27 @@ gi_marshalling_tests_garray_utf8_container_inout (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_full_inout (GArray **array_)
 {
-    static gchar *val1 = "-1";
-    static gchar *val2 = "-2";
-    gchar *val;
-    GArray *result;
+  static gchar *val1 = "-1";
+  static gchar *val2 = "-2";
+  gchar *val;
+  GArray *result;
 
-    g_assert_cmpint((*array_)->len, ==, 3);
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 0), ==, "0");
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 1), ==, "1");
-    g_assert_cmpstr(g_array_index (*array_, gchar*, 2), ==, "2");
+  g_assert_cmpint ((*array_)->len, ==, 3);
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 0), ==, "0");
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 1), ==, "1");
+  g_assert_cmpstr (g_array_index (*array_, gchar *, 2), ==, "2");
 
-    result = g_array_new (TRUE, TRUE, sizeof (gchar *));
-    val = g_strdup (val2);
-    g_array_append_val(result, val);
-    val = g_strdup (val1);
-    g_array_append_val(result, val);
-    val = g_strdup ("0");
-    g_array_append_val(result, val);
-    val = g_strdup ("1");
-    g_array_append_val(result, val);
+  result = g_array_new (TRUE, TRUE, sizeof (gchar *));
+  val = g_strdup (val2);
+  g_array_append_val (result, val);
+  val = g_strdup (val1);
+  g_array_append_val (result, val);
+  val = g_strdup ("0");
+  g_array_append_val (result, val);
+  val = g_strdup ("1");
+  g_array_append_val (result, val);
 
-    *array_ = result;
+  *array_ = result;
 }
 
 /**
@@ -2044,17 +2053,18 @@ gi_marshalling_tests_garray_utf8_full_inout (GArray **array_)
 GPtrArray *
 gi_marshalling_tests_gptrarray_utf8_none_return (void)
 {
-    static GPtrArray *parray = NULL;
-    static gchar *values[] = {"0", "1", "2"};
-    gint i;
+  static GPtrArray *parray = NULL;
+  static gchar *values[] = { "0", "1", "2" };
+  gint i;
 
-    if (parray == NULL) {
-        parray = g_ptr_array_new ();
-        for (i = 0; i < 3; i++)
-            g_ptr_array_add (parray, (gpointer) values[i]);
+  if (parray == NULL)
+    {
+      parray = g_ptr_array_new ();
+      for (i = 0; i < 3; i++)
+        g_ptr_array_add (parray, (gpointer) values[i]);
     }
 
-    return parray;
+  return parray;
 }
 
 /**
@@ -2065,15 +2075,15 @@ gi_marshalling_tests_gptrarray_utf8_none_return (void)
 GPtrArray *
 gi_marshalling_tests_gptrarray_utf8_container_return (void)
 {
-    GPtrArray *parray = NULL;
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  GPtrArray *parray = NULL;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    parray = g_ptr_array_new ();
-    for (i = 0; values[i]; i++)
-        g_ptr_array_add (parray, (gpointer)values[i]);
+  parray = g_ptr_array_new ();
+  for (i = 0; values[i]; i++)
+    g_ptr_array_add (parray, (gpointer) values[i]);
 
-    return parray;
+  return parray;
 }
 
 /**
@@ -2084,17 +2094,18 @@ gi_marshalling_tests_gptrarray_utf8_container_return (void)
 GPtrArray *
 gi_marshalling_tests_gptrarray_utf8_full_return (void)
 {
-    GPtrArray *parray = NULL;
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  GPtrArray *parray = NULL;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    parray = g_ptr_array_new ();
-    for (i = 0; values[i]; i++) {
-        gchar *str = g_strdup (values[i]);
-        g_ptr_array_add (parray, (gpointer)str);
+  parray = g_ptr_array_new ();
+  for (i = 0; values[i]; i++)
+    {
+      gchar *str = g_strdup (values[i]);
+      g_ptr_array_add (parray, (gpointer) str);
     }
 
-    return parray;
+  return parray;
 }
 
 /**
@@ -2104,10 +2115,10 @@ gi_marshalling_tests_gptrarray_utf8_full_return (void)
 void
 gi_marshalling_tests_gptrarray_utf8_none_in (GPtrArray *parray_)
 {
-    g_assert_cmpint(parray_->len, ==, 3);
-    g_assert_cmpstr(g_ptr_array_index (parray_, 0), ==, "0");
-    g_assert_cmpstr(g_ptr_array_index (parray_, 1), ==, "1");
-    g_assert_cmpstr(g_ptr_array_index (parray_, 2), ==, "2");
+  g_assert_cmpint (parray_->len, ==, 3);
+  g_assert_cmpstr (g_ptr_array_index (parray_, 0), ==, "0");
+  g_assert_cmpstr (g_ptr_array_index (parray_, 1), ==, "1");
+  g_assert_cmpstr (g_ptr_array_index (parray_, 2), ==, "2");
 }
 
 /**
@@ -2117,17 +2128,18 @@ gi_marshalling_tests_gptrarray_utf8_none_in (GPtrArray *parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_none_out (GPtrArray **parray_)
 {
-    static GPtrArray *internal = NULL;
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static GPtrArray *internal = NULL;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    if (internal == NULL) {
-        internal = g_ptr_array_new ();
-        for (i = 0; values[i]; i++)
-            g_ptr_array_add (internal, (gpointer)values[i]);
+  if (internal == NULL)
+    {
+      internal = g_ptr_array_new ();
+      for (i = 0; values[i]; i++)
+        g_ptr_array_add (internal, (gpointer) values[i]);
     }
 
-    *parray_ = internal;
+  *parray_ = internal;
 }
 
 /**
@@ -2137,14 +2149,14 @@ gi_marshalling_tests_gptrarray_utf8_none_out (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_container_out (GPtrArray **parray_)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    *parray_ = NULL;
+  *parray_ = NULL;
 
-    *parray_ = g_ptr_array_new ();
-    for (i = 0; values[i]; i++)
-        g_ptr_array_add (*parray_, (gpointer)values[i]);
+  *parray_ = g_ptr_array_new ();
+  for (i = 0; values[i]; i++)
+    g_ptr_array_add (*parray_, (gpointer) values[i]);
 }
 
 /**
@@ -2154,15 +2166,16 @@ gi_marshalling_tests_gptrarray_utf8_container_out (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_full_out (GPtrArray **parray_)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    gint i;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  gint i;
 
-    *parray_ = NULL;
+  *parray_ = NULL;
 
-    *parray_ = g_ptr_array_new ();
-    for (i = 0; values[i]; i++) {
-        gchar *str = g_strdup (values[i]);
-        g_ptr_array_add (*parray_, (gpointer)str);
+  *parray_ = g_ptr_array_new ();
+  for (i = 0; values[i]; i++)
+    {
+      gchar *str = g_strdup (values[i]);
+      g_ptr_array_add (*parray_, (gpointer) str);
     }
 }
 
@@ -2173,22 +2186,23 @@ gi_marshalling_tests_gptrarray_utf8_full_out (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_none_inout (GPtrArray **parray_)
 {
-    static GPtrArray *internal = NULL;
-    static gchar *values[] = {"-2", "-1", "0", "1", NULL};
-    gint i;
+  static GPtrArray *internal = NULL;
+  static gchar *values[] = { "-2", "-1", "0", "1", NULL };
+  gint i;
 
-    g_assert_cmpint((*parray_)->len, ==, 3);
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 0), ==, "0");
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 1), ==, "1");
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 2), ==, "2");
+  g_assert_cmpint ((*parray_)->len, ==, 3);
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 0), ==, "0");
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 1), ==, "1");
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 2), ==, "2");
 
-    if (internal == NULL) {
-        internal = g_ptr_array_new ();
-        for (i = 0; values[i]; i++)
-            g_ptr_array_add (internal, (gpointer) values[i]);
+  if (internal == NULL)
+    {
+      internal = g_ptr_array_new ();
+      for (i = 0; values[i]; i++)
+        g_ptr_array_add (internal, (gpointer) values[i]);
     }
 
-    *parray_ = internal;
+  *parray_ = internal;
 }
 
 /**
@@ -2198,24 +2212,24 @@ gi_marshalling_tests_gptrarray_utf8_none_inout (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_container_inout (GPtrArray **parray_)
 {
-    static gchar *val1 = "-2";
-    static gchar *val2 = "-1";
-    static gchar *val3 = "0";
-    static gchar *val4 = "1";
-    GPtrArray *result;
+  static gchar *val1 = "-2";
+  static gchar *val2 = "-1";
+  static gchar *val3 = "0";
+  static gchar *val4 = "1";
+  GPtrArray *result;
 
-    g_assert_cmpint((*parray_)->len, ==, 3);
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 0), ==, "0");
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 1), ==, "1");
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 2), ==, "2");
+  g_assert_cmpint ((*parray_)->len, ==, 3);
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 0), ==, "0");
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 1), ==, "1");
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 2), ==, "2");
 
-    result = g_ptr_array_new ();
-    g_ptr_array_add (result, (gpointer) val1);
-    g_ptr_array_add (result, (gpointer) val2);
-    g_ptr_array_add (result, (gpointer) val3);
-    g_ptr_array_add (result, (gpointer) val4);
+  result = g_ptr_array_new ();
+  g_ptr_array_add (result, (gpointer) val1);
+  g_ptr_array_add (result, (gpointer) val2);
+  g_ptr_array_add (result, (gpointer) val3);
+  g_ptr_array_add (result, (gpointer) val4);
 
-    *parray_ = result;
+  *parray_ = result;
 }
 
 /**
@@ -2225,27 +2239,27 @@ gi_marshalling_tests_gptrarray_utf8_container_inout (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_full_inout (GPtrArray **parray_)
 {
-    static gchar *val1 = "-1";
-    static gchar *val2 = "-2";
-    gchar *val;
-    GPtrArray *result;
+  static gchar *val1 = "-1";
+  static gchar *val2 = "-2";
+  gchar *val;
+  GPtrArray *result;
 
-    g_assert_cmpint((*parray_)->len, ==, 3);
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 0), ==, "0");
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 1), ==, "1");
-    g_assert_cmpstr(g_ptr_array_index (*parray_, 2), ==, "2");
+  g_assert_cmpint ((*parray_)->len, ==, 3);
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 0), ==, "0");
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 1), ==, "1");
+  g_assert_cmpstr (g_ptr_array_index (*parray_, 2), ==, "2");
 
-    result = g_ptr_array_new ();
-    val = g_strdup (val2);
-    g_ptr_array_add(result, (gpointer) val);
-    val = g_strdup (val1);
-    g_ptr_array_add(result, (gpointer) val);
-    val = g_strdup ("0");
-    g_ptr_array_add(result, (gpointer) val);
-    val = g_strdup ("1");
-    g_ptr_array_add(result, (gpointer) val);
+  result = g_ptr_array_new ();
+  val = g_strdup (val2);
+  g_ptr_array_add (result, (gpointer) val);
+  val = g_strdup (val1);
+  g_ptr_array_add (result, (gpointer) val);
+  val = g_strdup ("0");
+  g_ptr_array_add (result, (gpointer) val);
+  val = g_strdup ("1");
+  g_ptr_array_add (result, (gpointer) val);
 
-    *parray_ = result;
+  *parray_ = result;
 }
 
 /**
@@ -2256,13 +2270,13 @@ gi_marshalling_tests_gptrarray_utf8_full_inout (GPtrArray **parray_)
 GByteArray *
 gi_marshalling_tests_bytearray_full_return (void)
 {
-    GByteArray *array = NULL;
-    guint8 data[] = {'\0', '1', '\xFF', '3'};
+  GByteArray *array = NULL;
+  guint8 data[] = { '\0', '1', '\xFF', '3' };
 
-    array = g_byte_array_new ();
-    g_byte_array_append (array, (const guint8*)data, G_N_ELEMENTS(data));
+  array = g_byte_array_new ();
+  g_byte_array_append (array, (const guint8 *) data, G_N_ELEMENTS (data));
 
-    return array;
+  return array;
 
 }
 
@@ -2273,11 +2287,11 @@ gi_marshalling_tests_bytearray_full_return (void)
 void
 gi_marshalling_tests_bytearray_none_in (GByteArray *v)
 {
-    g_assert_cmpuint (v->len, ==, 4);
-    g_assert_cmpuint (g_array_index (v, unsigned char, 0), ==, 0);
-    g_assert_cmpuint (g_array_index (v, unsigned char, 1), ==, 49);
-    g_assert_cmpuint (g_array_index (v, unsigned char, 2), ==, 0xFF);
-    g_assert_cmpuint (g_array_index (v, unsigned char, 3), ==, 51);
+  g_assert_cmpuint (v->len, ==, 4);
+  g_assert_cmpuint (g_array_index (v, unsigned char, 0), ==, 0);
+  g_assert_cmpuint (g_array_index (v, unsigned char, 1), ==, 49);
+  g_assert_cmpuint (g_array_index (v, unsigned char, 2), ==, 0xFF);
+  g_assert_cmpuint (g_array_index (v, unsigned char, 3), ==, 51);
 }
 
 /**
@@ -2288,9 +2302,9 @@ gi_marshalling_tests_bytearray_none_in (GByteArray *v)
 GBytes *
 gi_marshalling_tests_gbytes_full_return (void)
 {
-  static guint8 data[] = {0, 49, 0xFF, 51};
+  static guint8 data[] = { 0, 49, 0xFF, 51 };
 
-  return g_bytes_new_static (data, G_N_ELEMENTS(data));
+  return g_bytes_new_static (data, G_N_ELEMENTS (data));
 }
 
 /**
@@ -2318,12 +2332,12 @@ gi_marshalling_tests_gbytes_none_in (GBytes *v)
 GStrv
 gi_marshalling_tests_gstrv_return (void)
 {
-    GStrv values = g_new0 (gchar*, 4);
-    values[0] = g_strdup ("0");
-    values[1] = g_strdup ("1");
-    values[2] = g_strdup ("2");
-    values[3] = NULL;
-    return values;
+  GStrv values = g_new0 (gchar *, 4);
+  values[0] = g_strdup ("0");
+  values[1] = g_strdup ("1");
+  values[2] = g_strdup ("2");
+  values[3] = NULL;
+  return values;
 }
 
 /**
@@ -2333,10 +2347,10 @@ gi_marshalling_tests_gstrv_return (void)
 void
 gi_marshalling_tests_gstrv_in (GStrv g_strv)
 {
-    g_assert_cmpint(g_strv_length(g_strv), ==, 3);
-    g_assert_cmpstr(g_strv[0], ==, "0");
-    g_assert_cmpstr(g_strv[1], ==, "1");
-    g_assert_cmpstr(g_strv[2], ==, "2");
+  g_assert_cmpint (g_strv_length (g_strv), ==, 3);
+  g_assert_cmpstr (g_strv[0], ==, "0");
+  g_assert_cmpstr (g_strv[1], ==, "1");
+  g_assert_cmpstr (g_strv[2], ==, "2");
 }
 
 /**
@@ -2346,8 +2360,8 @@ gi_marshalling_tests_gstrv_in (GStrv g_strv)
 void
 gi_marshalling_tests_gstrv_out (GStrv *g_strv)
 {
-    static gchar *values[] = {"0", "1", "2", NULL};
-    *g_strv = values;
+  static gchar *values[] = { "0", "1", "2", NULL };
+  *g_strv = values;
 }
 
 /**
@@ -2357,14 +2371,14 @@ gi_marshalling_tests_gstrv_out (GStrv *g_strv)
 void
 gi_marshalling_tests_gstrv_inout (GStrv *g_strv)
 {
-    static gchar *values[] = {"-1", "0", "1", "2", NULL};
+  static gchar *values[] = { "-1", "0", "1", "2", NULL };
 
-    g_assert(g_strv_length(*g_strv) == 3);
-    g_assert(strcmp((*g_strv)[0], "0") == 0);
-    g_assert(strcmp((*g_strv)[1], "1") == 0);
-    g_assert(strcmp((*g_strv)[2], "2") == 0);
+  g_assert (g_strv_length (*g_strv) == 3);
+  g_assert (strcmp ((*g_strv)[0], "0") == 0);
+  g_assert (strcmp ((*g_strv)[1], "1") == 0);
+  g_assert (strcmp ((*g_strv)[2], "2") == 0);
 
-    *g_strv = values;
+  *g_strv = values;
 }
 
 /**
@@ -2375,16 +2389,17 @@ gi_marshalling_tests_gstrv_inout (GStrv *g_strv)
 GList *
 gi_marshalling_tests_glist_int_none_return (void)
 {
-    static GList *list = NULL;
+  static GList *list = NULL;
 
-    if (list == NULL) {
-        list = g_list_append(list, GINT_TO_POINTER(-1));
-        list = g_list_append(list, GINT_TO_POINTER(0));
-        list = g_list_append(list, GINT_TO_POINTER(1));
-        list = g_list_append(list, GINT_TO_POINTER(2));
+  if (list == NULL)
+    {
+      list = g_list_append (list, GINT_TO_POINTER (-1));
+      list = g_list_append (list, GINT_TO_POINTER (0));
+      list = g_list_append (list, GINT_TO_POINTER (1));
+      list = g_list_append (list, GINT_TO_POINTER (2));
     }
 
-    return list;
+  return list;
 }
 
 /**
@@ -2395,14 +2410,15 @@ gi_marshalling_tests_glist_int_none_return (void)
 GList *
 gi_marshalling_tests_glist_uint32_none_return (void)
 {
-    static GList *list = NULL;
+  static GList *list = NULL;
 
-    if (list == NULL) {
-        list = g_list_append(list, GUINT_TO_POINTER(0));
-        list = g_list_append(list, GUINT_TO_POINTER(G_MAXUINT32));
+  if (list == NULL)
+    {
+      list = g_list_append (list, GUINT_TO_POINTER (0));
+      list = g_list_append (list, GUINT_TO_POINTER (G_MAXUINT32));
     }
 
-    return list;
+  return list;
 }
 
 /**
@@ -2413,15 +2429,16 @@ gi_marshalling_tests_glist_uint32_none_return (void)
 GList *
 gi_marshalling_tests_glist_utf8_none_return (void)
 {
-    static GList *list = NULL;
+  static GList *list = NULL;
 
-    if (list == NULL) {
-        list = g_list_append(list, "0");
-        list = g_list_append(list, "1");
-        list = g_list_append(list, "2");
+  if (list == NULL)
+    {
+      list = g_list_append (list, "0");
+      list = g_list_append (list, "1");
+      list = g_list_append (list, "2");
     }
 
-    return list;
+  return list;
 }
 
 /**
@@ -2432,13 +2449,13 @@ gi_marshalling_tests_glist_utf8_none_return (void)
 GList *
 gi_marshalling_tests_glist_utf8_container_return (void)
 {
-    GList *list = NULL;
+  GList *list = NULL;
 
-    list = g_list_append(list, "0");
-    list = g_list_append(list, "1");
-    list = g_list_append(list, "2");
+  list = g_list_append (list, "0");
+  list = g_list_append (list, "1");
+  list = g_list_append (list, "2");
 
-    return list;
+  return list;
 }
 
 /**
@@ -2449,13 +2466,13 @@ gi_marshalling_tests_glist_utf8_container_return (void)
 GList *
 gi_marshalling_tests_glist_utf8_full_return (void)
 {
-    GList *list = NULL;
+  GList *list = NULL;
 
-    list = g_list_append(list, g_strdup("0"));
-    list = g_list_append(list, g_strdup("1"));
-    list = g_list_append(list, g_strdup("2"));
+  list = g_list_append (list, g_strdup ("0"));
+  list = g_list_append (list, g_strdup ("1"));
+  list = g_list_append (list, g_strdup ("2"));
 
-    return list;
+  return list;
 }
 
 /**
@@ -2465,11 +2482,11 @@ gi_marshalling_tests_glist_utf8_full_return (void)
 void
 gi_marshalling_tests_glist_int_none_in (GList *list)
 {
-    g_assert_cmpint(g_list_length(list), ==, 4);
-    g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 0)), ==, -1);
-    g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 1)), ==, 0);
-    g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 2)), ==, 1);
-    g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 3)), ==, 2);
+  g_assert_cmpint (g_list_length (list), ==, 4);
+  g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 0)), ==, -1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 1)), ==, 0);
+  g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 2)), ==, 1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 3)), ==, 2);
 }
 
 /**
@@ -2479,9 +2496,9 @@ gi_marshalling_tests_glist_int_none_in (GList *list)
 void
 gi_marshalling_tests_glist_uint32_none_in (GList *list)
 {
-    g_assert_cmpint(g_list_length(list), ==, 2);
-    g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 0)), ==, 0);
-    g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 1)), ==, G_MAXUINT32);
+  g_assert_cmpint (g_list_length (list), ==, 2);
+  g_assert_cmpint (GPOINTER_TO_UINT (g_list_nth_data (list, 0)), ==, 0);
+  g_assert_cmpint (GPOINTER_TO_UINT (g_list_nth_data (list, 1)), ==, G_MAXUINT32);
 }
 
 /**
@@ -2491,10 +2508,10 @@ gi_marshalling_tests_glist_uint32_none_in (GList *list)
 void
 gi_marshalling_tests_glist_utf8_none_in (GList *list)
 {
-    g_assert_cmpint(g_list_length(list), ==, 3);
-    g_assert_cmpint(strcmp(g_list_nth_data(list, 0), "0"), ==, 0);
-    g_assert_cmpint(strcmp(g_list_nth_data(list, 1), "1"), ==, 0);
-    g_assert_cmpint(strcmp(g_list_nth_data(list, 2), "2"), ==, 0);
+  g_assert_cmpint (g_list_length (list), ==, 3);
+  g_assert_cmpint (strcmp (g_list_nth_data (list, 0), "0"), ==, 0);
+  g_assert_cmpint (strcmp (g_list_nth_data (list, 1), "1"), ==, 0);
+  g_assert_cmpint (strcmp (g_list_nth_data (list, 2), "2"), ==, 0);
 }
 
 /**
@@ -2504,15 +2521,16 @@ gi_marshalling_tests_glist_utf8_none_in (GList *list)
 void
 gi_marshalling_tests_glist_utf8_none_out (GList **list)
 {
-    static GList *values = NULL;
+  static GList *values = NULL;
 
-    if (values == NULL) {
-        values = g_list_append(values, "0");
-        values = g_list_append(values, "1");
-        values = g_list_append(values, "2");
+  if (values == NULL)
+    {
+      values = g_list_append (values, "0");
+      values = g_list_append (values, "1");
+      values = g_list_append (values, "2");
     }
 
-    *list = values;
+  *list = values;
 }
 
 /**
@@ -2522,11 +2540,11 @@ gi_marshalling_tests_glist_utf8_none_out (GList **list)
 void
 gi_marshalling_tests_glist_utf8_container_out (GList **list)
 {
-    *list = NULL;
+  *list = NULL;
 
-    *list = g_list_append(*list, "0");
-    *list = g_list_append(*list, "1");
-    *list = g_list_append(*list, "2");
+  *list = g_list_append (*list, "0");
+  *list = g_list_append (*list, "1");
+  *list = g_list_append (*list, "2");
 }
 
 /**
@@ -2536,11 +2554,11 @@ gi_marshalling_tests_glist_utf8_container_out (GList **list)
 void
 gi_marshalling_tests_glist_utf8_full_out (GList **list)
 {
-    *list = NULL;
+  *list = NULL;
 
-    *list = g_list_append(*list, g_strdup("0"));
-    *list = g_list_append(*list, g_strdup("1"));
-    *list = g_list_append(*list, g_strdup("2"));
+  *list = g_list_append (*list, g_strdup ("0"));
+  *list = g_list_append (*list, g_strdup ("1"));
+  *list = g_list_append (*list, g_strdup ("2"));
 }
 
 /**
@@ -2550,21 +2568,22 @@ gi_marshalling_tests_glist_utf8_full_out (GList **list)
 void
 gi_marshalling_tests_glist_utf8_none_inout (GList **list)
 {
-    static GList *values = NULL;
+  static GList *values = NULL;
 
-    g_assert_cmpint(g_list_length(*list), ==, 3);
-    g_assert_cmpstr(g_list_nth_data(*list, 0), ==, "0");
-    g_assert_cmpstr(g_list_nth_data(*list, 1), ==, "1");
-    g_assert_cmpstr(g_list_nth_data(*list, 2), ==, "2");
+  g_assert_cmpint (g_list_length (*list), ==, 3);
+  g_assert_cmpstr (g_list_nth_data (*list, 0), ==, "0");
+  g_assert_cmpstr (g_list_nth_data (*list, 1), ==, "1");
+  g_assert_cmpstr (g_list_nth_data (*list, 2), ==, "2");
 
-    if (values == NULL) {
-        values = g_list_append(values, "-2");
-        values = g_list_append(values, "-1");
-        values = g_list_append(values, "0");
-        values = g_list_append(values, "1");
+  if (values == NULL)
+    {
+      values = g_list_append (values, "-2");
+      values = g_list_append (values, "-1");
+      values = g_list_append (values, "0");
+      values = g_list_append (values, "1");
     }
 
-    *list = values;
+  *list = values;
 }
 
 /**
@@ -2574,19 +2593,19 @@ gi_marshalling_tests_glist_utf8_none_inout (GList **list)
 void
 gi_marshalling_tests_glist_utf8_container_inout (GList **list)
 {
-    GList *result = NULL;
+  GList *result = NULL;
 
-    g_assert_cmpint(g_list_length(*list), ==, 3);
-    g_assert_cmpstr(g_list_nth_data(*list, 0), ==, "0");
-    g_assert_cmpstr(g_list_nth_data(*list, 1), ==, "1");
-    g_assert_cmpstr(g_list_nth_data(*list, 2), ==, "2");
+  g_assert_cmpint (g_list_length (*list), ==, 3);
+  g_assert_cmpstr (g_list_nth_data (*list, 0), ==, "0");
+  g_assert_cmpstr (g_list_nth_data (*list, 1), ==, "1");
+  g_assert_cmpstr (g_list_nth_data (*list, 2), ==, "2");
 
-    result = g_list_prepend(result, "1");
-    result = g_list_prepend(result, "0");
-    result = g_list_prepend(result, "-1");
-    result = g_list_prepend(result, "-2");
+  result = g_list_prepend (result, "1");
+  result = g_list_prepend (result, "0");
+  result = g_list_prepend (result, "-1");
+  result = g_list_prepend (result, "-2");
 
-    *list = result;
+  *list = result;
 }
 
 /**
@@ -2596,19 +2615,19 @@ gi_marshalling_tests_glist_utf8_container_inout (GList **list)
 void
 gi_marshalling_tests_glist_utf8_full_inout (GList **list)
 {
-    GList *result = NULL;
+  GList *result = NULL;
 
-    g_assert_cmpint(g_list_length(*list), ==, 3);
-    g_assert_cmpstr(g_list_nth_data(*list, 0), ==, "0");
-    g_assert_cmpstr(g_list_nth_data(*list, 1), ==, "1");
-    g_assert_cmpstr(g_list_nth_data(*list, 2), ==, "2");
+  g_assert_cmpint (g_list_length (*list), ==, 3);
+  g_assert_cmpstr (g_list_nth_data (*list, 0), ==, "0");
+  g_assert_cmpstr (g_list_nth_data (*list, 1), ==, "1");
+  g_assert_cmpstr (g_list_nth_data (*list, 2), ==, "2");
 
-    result = g_list_prepend(result, g_strdup("1"));
-    result = g_list_prepend(result, g_strdup("0"));
-    result = g_list_prepend(result, g_strdup("-1"));
-    result = g_list_prepend(result, g_strdup("-2"));
+  result = g_list_prepend (result, g_strdup ("1"));
+  result = g_list_prepend (result, g_strdup ("0"));
+  result = g_list_prepend (result, g_strdup ("-1"));
+  result = g_list_prepend (result, g_strdup ("-2"));
 
-    *list = result;
+  *list = result;
 }
 
 
@@ -2620,17 +2639,18 @@ gi_marshalling_tests_glist_utf8_full_inout (GList **list)
 GSList *
 gi_marshalling_tests_gslist_int_none_return (void)
 {
-    static GSList *list = NULL;
+  static GSList *list = NULL;
 
-    if (list == NULL) {
-        list = g_slist_prepend(list, GINT_TO_POINTER(-1));
-        list = g_slist_prepend(list, GINT_TO_POINTER(0));
-        list = g_slist_prepend(list, GINT_TO_POINTER(1));
-        list = g_slist_prepend(list, GINT_TO_POINTER(2));
-        list = g_slist_reverse(list);
+  if (list == NULL)
+    {
+      list = g_slist_prepend (list, GINT_TO_POINTER (-1));
+      list = g_slist_prepend (list, GINT_TO_POINTER (0));
+      list = g_slist_prepend (list, GINT_TO_POINTER (1));
+      list = g_slist_prepend (list, GINT_TO_POINTER (2));
+      list = g_slist_reverse (list);
     }
 
-    return list;
+  return list;
 }
 
 /**
@@ -2641,16 +2661,17 @@ gi_marshalling_tests_gslist_int_none_return (void)
 GSList *
 gi_marshalling_tests_gslist_utf8_none_return (void)
 {
-    static GSList *list = NULL;
+  static GSList *list = NULL;
 
-    if (list == NULL) {
-        list = g_slist_prepend(list, "0");
-        list = g_slist_prepend(list, "1");
-        list = g_slist_prepend(list, "2");
-        list = g_slist_reverse(list);
+  if (list == NULL)
+    {
+      list = g_slist_prepend (list, "0");
+      list = g_slist_prepend (list, "1");
+      list = g_slist_prepend (list, "2");
+      list = g_slist_reverse (list);
     }
 
-    return list;
+  return list;
 }
 
 /**
@@ -2661,14 +2682,14 @@ gi_marshalling_tests_gslist_utf8_none_return (void)
 GSList *
 gi_marshalling_tests_gslist_utf8_container_return (void)
 {
-    GSList *list = NULL;
+  GSList *list = NULL;
 
-    list = g_slist_prepend(list, "0");
-    list = g_slist_prepend(list, "1");
-    list = g_slist_prepend(list, "2");
-    list = g_slist_reverse(list);
+  list = g_slist_prepend (list, "0");
+  list = g_slist_prepend (list, "1");
+  list = g_slist_prepend (list, "2");
+  list = g_slist_reverse (list);
 
-    return list;
+  return list;
 }
 
 /**
@@ -2679,14 +2700,14 @@ gi_marshalling_tests_gslist_utf8_container_return (void)
 GSList *
 gi_marshalling_tests_gslist_utf8_full_return (void)
 {
-    GSList *list = NULL;
+  GSList *list = NULL;
 
-    list = g_slist_prepend(list, g_strdup("0"));
-    list = g_slist_prepend(list, g_strdup("1"));
-    list = g_slist_prepend(list, g_strdup("2"));
-    list = g_slist_reverse(list);
+  list = g_slist_prepend (list, g_strdup ("0"));
+  list = g_slist_prepend (list, g_strdup ("1"));
+  list = g_slist_prepend (list, g_strdup ("2"));
+  list = g_slist_reverse (list);
 
-    return list;
+  return list;
 }
 
 /**
@@ -2696,11 +2717,11 @@ gi_marshalling_tests_gslist_utf8_full_return (void)
 void
 gi_marshalling_tests_gslist_int_none_in (GSList *list)
 {
-    g_assert_cmpint(g_slist_length(list), ==, 4);
-    g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 0)), ==, -1);
-    g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 1)), ==, 0);
-    g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 2)), ==, 1);
-    g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 3)), ==, 2);
+  g_assert_cmpint (g_slist_length (list), ==, 4);
+  g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 0)), ==, -1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 1)), ==, 0);
+  g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 2)), ==, 1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 3)), ==, 2);
 }
 
 /**
@@ -2710,10 +2731,10 @@ gi_marshalling_tests_gslist_int_none_in (GSList *list)
 void
 gi_marshalling_tests_gslist_utf8_none_in (GSList *list)
 {
-    g_assert_cmpint(g_slist_length(list), ==, 3);
-    g_assert_cmpstr(g_slist_nth_data(list, 0), ==, "0");
-    g_assert_cmpstr(g_slist_nth_data(list, 1), ==, "1");
-    g_assert_cmpstr(g_slist_nth_data(list, 2), ==, "2");
+  g_assert_cmpint (g_slist_length (list), ==, 3);
+  g_assert_cmpstr (g_slist_nth_data (list, 0), ==, "0");
+  g_assert_cmpstr (g_slist_nth_data (list, 1), ==, "1");
+  g_assert_cmpstr (g_slist_nth_data (list, 2), ==, "2");
 }
 
 /**
@@ -2723,16 +2744,17 @@ gi_marshalling_tests_gslist_utf8_none_in (GSList *list)
 void
 gi_marshalling_tests_gslist_utf8_none_out (GSList **list)
 {
-    static GSList *values = NULL;
+  static GSList *values = NULL;
 
-    if (values == NULL) {
-        values = g_slist_prepend(values, "0");
-        values = g_slist_prepend(values, "1");
-        values = g_slist_prepend(values, "2");
-        values = g_slist_reverse(values);
+  if (values == NULL)
+    {
+      values = g_slist_prepend (values, "0");
+      values = g_slist_prepend (values, "1");
+      values = g_slist_prepend (values, "2");
+      values = g_slist_reverse (values);
     }
 
-    *list = values;
+  *list = values;
 }
 
 /**
@@ -2742,12 +2764,12 @@ gi_marshalling_tests_gslist_utf8_none_out (GSList **list)
 void
 gi_marshalling_tests_gslist_utf8_container_out (GSList **list)
 {
-    *list = NULL;
+  *list = NULL;
 
-    *list = g_slist_prepend(*list, "0");
-    *list = g_slist_prepend(*list, "1");
-    *list = g_slist_prepend(*list, "2");
-    *list = g_slist_reverse(*list);
+  *list = g_slist_prepend (*list, "0");
+  *list = g_slist_prepend (*list, "1");
+  *list = g_slist_prepend (*list, "2");
+  *list = g_slist_reverse (*list);
 }
 
 /**
@@ -2757,12 +2779,12 @@ gi_marshalling_tests_gslist_utf8_container_out (GSList **list)
 void
 gi_marshalling_tests_gslist_utf8_full_out (GSList **list)
 {
-    *list = NULL;
+  *list = NULL;
 
-    *list = g_slist_prepend(*list, g_strdup("0"));
-    *list = g_slist_prepend(*list, g_strdup("1"));
-    *list = g_slist_prepend(*list, g_strdup("2"));
-    *list = g_slist_reverse(*list);
+  *list = g_slist_prepend (*list, g_strdup ("0"));
+  *list = g_slist_prepend (*list, g_strdup ("1"));
+  *list = g_slist_prepend (*list, g_strdup ("2"));
+  *list = g_slist_reverse (*list);
 }
 
 /**
@@ -2772,22 +2794,23 @@ gi_marshalling_tests_gslist_utf8_full_out (GSList **list)
 void
 gi_marshalling_tests_gslist_utf8_none_inout (GSList **list)
 {
-    static GSList *values = NULL;
+  static GSList *values = NULL;
 
-    g_assert_cmpint(g_slist_length(*list), ==, 3);
-    g_assert_cmpstr(g_slist_nth_data(*list, 0), ==, "0");
-    g_assert_cmpstr(g_slist_nth_data(*list, 1), ==, "1");
-    g_assert_cmpstr(g_slist_nth_data(*list, 2), ==, "2");
+  g_assert_cmpint (g_slist_length (*list), ==, 3);
+  g_assert_cmpstr (g_slist_nth_data (*list, 0), ==, "0");
+  g_assert_cmpstr (g_slist_nth_data (*list, 1), ==, "1");
+  g_assert_cmpstr (g_slist_nth_data (*list, 2), ==, "2");
 
-    if (values == NULL) {
-        values = g_slist_prepend(values, "-2");
-        values = g_slist_prepend(values, "-1");
-        values = g_slist_prepend(values, "0");
-        values = g_slist_prepend(values, "1");
-        values = g_slist_reverse(values);
+  if (values == NULL)
+    {
+      values = g_slist_prepend (values, "-2");
+      values = g_slist_prepend (values, "-1");
+      values = g_slist_prepend (values, "0");
+      values = g_slist_prepend (values, "1");
+      values = g_slist_reverse (values);
     }
 
-    *list = values;
+  *list = values;
 }
 
 /**
@@ -2797,19 +2820,19 @@ gi_marshalling_tests_gslist_utf8_none_inout (GSList **list)
 void
 gi_marshalling_tests_gslist_utf8_container_inout (GSList **list)
 {
-    GSList *result = NULL;
+  GSList *result = NULL;
 
-    g_assert_cmpint(g_slist_length(*list), ==, 3);
-    g_assert_cmpstr(g_slist_nth_data(*list, 0), ==, "0");
-    g_assert_cmpstr(g_slist_nth_data(*list, 1), ==, "1");
-    g_assert_cmpstr(g_slist_nth_data(*list, 2), ==, "2");
+  g_assert_cmpint (g_slist_length (*list), ==, 3);
+  g_assert_cmpstr (g_slist_nth_data (*list, 0), ==, "0");
+  g_assert_cmpstr (g_slist_nth_data (*list, 1), ==, "1");
+  g_assert_cmpstr (g_slist_nth_data (*list, 2), ==, "2");
 
-    result = g_slist_prepend(result, "1");
-    result = g_slist_prepend(result, "0");
-    result = g_slist_prepend(result, "-1");
-    result = g_slist_prepend(result, "-2");
+  result = g_slist_prepend (result, "1");
+  result = g_slist_prepend (result, "0");
+  result = g_slist_prepend (result, "-1");
+  result = g_slist_prepend (result, "-2");
 
-    *list = result;
+  *list = result;
 }
 
 /**
@@ -2819,19 +2842,19 @@ gi_marshalling_tests_gslist_utf8_container_inout (GSList **list)
 void
 gi_marshalling_tests_gslist_utf8_full_inout (GSList **list)
 {
-    GSList *result = NULL;
+  GSList *result = NULL;
 
-    g_assert_cmpint(g_slist_length(*list), ==, 3);
-    g_assert_cmpstr(g_slist_nth_data(*list, 0), ==, "0");
-    g_assert_cmpstr(g_slist_nth_data(*list, 1), ==, "1");
-    g_assert_cmpstr(g_slist_nth_data(*list, 2), ==, "2");
+  g_assert_cmpint (g_slist_length (*list), ==, 3);
+  g_assert_cmpstr (g_slist_nth_data (*list, 0), ==, "0");
+  g_assert_cmpstr (g_slist_nth_data (*list, 1), ==, "1");
+  g_assert_cmpstr (g_slist_nth_data (*list, 2), ==, "2");
 
-    result = g_slist_prepend(result, g_strdup("1"));
-    result = g_slist_prepend(result, g_strdup("0"));
-    result = g_slist_prepend(result, g_strdup("-1"));
-    result = g_slist_prepend(result, g_strdup("-2"));
+  result = g_slist_prepend (result, g_strdup ("1"));
+  result = g_slist_prepend (result, g_strdup ("0"));
+  result = g_slist_prepend (result, g_strdup ("-1"));
+  result = g_slist_prepend (result, g_strdup ("-2"));
 
-    *list = result;
+  *list = result;
 }
 
 
@@ -2843,17 +2866,18 @@ gi_marshalling_tests_gslist_utf8_full_inout (GSList **list)
 GHashTable *
 gi_marshalling_tests_ghashtable_int_none_return (void)
 {
-    static GHashTable *hash_table = NULL;
+  static GHashTable *hash_table = NULL;
 
-    if (hash_table == NULL) {
-        hash_table = g_hash_table_new(NULL, NULL);
-        g_hash_table_insert(hash_table, GINT_TO_POINTER(-1), GINT_TO_POINTER(1));
-        g_hash_table_insert(hash_table, GINT_TO_POINTER(0), GINT_TO_POINTER(0));
-        g_hash_table_insert(hash_table, GINT_TO_POINTER(1), GINT_TO_POINTER(-1));
-        g_hash_table_insert(hash_table, GINT_TO_POINTER(2), GINT_TO_POINTER(-2));
+  if (hash_table == NULL)
+    {
+      hash_table = g_hash_table_new (NULL, NULL);
+      g_hash_table_insert (hash_table, GINT_TO_POINTER (-1), GINT_TO_POINTER (1));
+      g_hash_table_insert (hash_table, GINT_TO_POINTER (0), GINT_TO_POINTER (0));
+      g_hash_table_insert (hash_table, GINT_TO_POINTER (1), GINT_TO_POINTER (-1));
+      g_hash_table_insert (hash_table, GINT_TO_POINTER (2), GINT_TO_POINTER (-2));
     }
 
-    return hash_table;
+  return hash_table;
 }
 
 /**
@@ -2864,17 +2888,18 @@ gi_marshalling_tests_ghashtable_int_none_return (void)
 GHashTable *
 gi_marshalling_tests_ghashtable_utf8_none_return (void)
 {
-    static GHashTable *hash_table = NULL;
+  static GHashTable *hash_table = NULL;
 
-    if (hash_table == NULL) {
-        hash_table = g_hash_table_new(g_str_hash, g_str_equal);
-        g_hash_table_insert(hash_table, "-1", "1");
-        g_hash_table_insert(hash_table, "0", "0");
-        g_hash_table_insert(hash_table, "1", "-1");
-        g_hash_table_insert(hash_table, "2", "-2");
+  if (hash_table == NULL)
+    {
+      hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+      g_hash_table_insert (hash_table, "-1", "1");
+      g_hash_table_insert (hash_table, "0", "0");
+      g_hash_table_insert (hash_table, "1", "-1");
+      g_hash_table_insert (hash_table, "2", "-2");
     }
 
-    return hash_table;
+  return hash_table;
 }
 
 /**
@@ -2885,15 +2910,15 @@ gi_marshalling_tests_ghashtable_utf8_none_return (void)
 GHashTable *
 gi_marshalling_tests_ghashtable_utf8_container_return (void)
 {
-    GHashTable *hash_table = NULL;
+  GHashTable *hash_table = NULL;
 
-    hash_table = g_hash_table_new(g_str_hash, g_str_equal);
-    g_hash_table_insert(hash_table, "-1", "1");
-    g_hash_table_insert(hash_table, "0", "0");
-    g_hash_table_insert(hash_table, "1", "-1");
-    g_hash_table_insert(hash_table, "2", "-2");
+  hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+  g_hash_table_insert (hash_table, "-1", "1");
+  g_hash_table_insert (hash_table, "0", "0");
+  g_hash_table_insert (hash_table, "1", "-1");
+  g_hash_table_insert (hash_table, "2", "-2");
 
-    return hash_table;
+  return hash_table;
 }
 
 /**
@@ -2904,15 +2929,15 @@ gi_marshalling_tests_ghashtable_utf8_container_return (void)
 GHashTable *
 gi_marshalling_tests_ghashtable_utf8_full_return (void)
 {
-    GHashTable *hash_table = NULL;
+  GHashTable *hash_table = NULL;
 
-    hash_table = g_hash_table_new(g_str_hash, g_str_equal);
-    g_hash_table_insert(hash_table, g_strdup("-1"), g_strdup("1"));
-    g_hash_table_insert(hash_table, g_strdup("0"), g_strdup("0"));
-    g_hash_table_insert(hash_table, g_strdup("1"), g_strdup("-1"));
-    g_hash_table_insert(hash_table, g_strdup("2"), g_strdup("-2"));
+  hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+  g_hash_table_insert (hash_table, g_strdup ("-1"), g_strdup ("1"));
+  g_hash_table_insert (hash_table, g_strdup ("0"), g_strdup ("0"));
+  g_hash_table_insert (hash_table, g_strdup ("1"), g_strdup ("-1"));
+  g_hash_table_insert (hash_table, g_strdup ("2"), g_strdup ("-2"));
 
-    return hash_table;
+  return hash_table;
 }
 
 /**
@@ -2922,10 +2947,10 @@ gi_marshalling_tests_ghashtable_utf8_full_return (void)
 void
 gi_marshalling_tests_ghashtable_int_none_in (GHashTable *hash_table)
 {
-    g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(-1))), ==, 1);
-    g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(0))), ==, 0);
-    g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(1))), ==, -1);
-    g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(2))), ==, -2);
+  g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (-1))), ==, 1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (0))), ==, 0);
+  g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (1))), ==, -1);
+  g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (2))), ==, -2);
 }
 
 /**
@@ -2935,10 +2960,10 @@ gi_marshalling_tests_ghashtable_int_none_in (GHashTable *hash_table)
 void
 gi_marshalling_tests_ghashtable_utf8_none_in (GHashTable *hash_table)
 {
-    g_assert_cmpstr(g_hash_table_lookup(hash_table, "-1"), ==, "1");
-    g_assert_cmpstr(g_hash_table_lookup(hash_table, "0"), ==, "0");
-    g_assert_cmpstr(g_hash_table_lookup(hash_table, "1"), ==, "-1");
-    g_assert_cmpstr(g_hash_table_lookup(hash_table, "2"), ==, "-2");
+  g_assert_cmpstr (g_hash_table_lookup (hash_table, "-1"), ==, "1");
+  g_assert_cmpstr (g_hash_table_lookup (hash_table, "0"), ==, "0");
+  g_assert_cmpstr (g_hash_table_lookup (hash_table, "1"), ==, "-1");
+  g_assert_cmpstr (g_hash_table_lookup (hash_table, "2"), ==, "-2");
 }
 
 /**
@@ -2948,17 +2973,18 @@ gi_marshalling_tests_ghashtable_utf8_none_in (GHashTable *hash_table)
 void
 gi_marshalling_tests_ghashtable_utf8_none_out (GHashTable **hash_table)
 {
-    static GHashTable *new_hash_table = NULL;
+  static GHashTable *new_hash_table = NULL;
 
-    if (new_hash_table == NULL) {
-        new_hash_table = g_hash_table_new(g_str_hash, g_str_equal);
-        g_hash_table_insert(new_hash_table, "-1", "1");
-        g_hash_table_insert(new_hash_table, "0", "0");
-        g_hash_table_insert(new_hash_table, "1", "-1");
-        g_hash_table_insert(new_hash_table, "2", "-2");
+  if (new_hash_table == NULL)
+    {
+      new_hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+      g_hash_table_insert (new_hash_table, "-1", "1");
+      g_hash_table_insert (new_hash_table, "0", "0");
+      g_hash_table_insert (new_hash_table, "1", "-1");
+      g_hash_table_insert (new_hash_table, "2", "-2");
     }
 
-    *hash_table = new_hash_table;
+  *hash_table = new_hash_table;
 }
 
 /**
@@ -2968,11 +2994,11 @@ gi_marshalling_tests_ghashtable_utf8_none_out (GHashTable **hash_table)
 void
 gi_marshalling_tests_ghashtable_utf8_container_out (GHashTable **hash_table)
 {
-    *hash_table = g_hash_table_new(g_str_hash, g_str_equal);
-    g_hash_table_insert(*hash_table, "-1", "1");
-    g_hash_table_insert(*hash_table, "0", "0");
-    g_hash_table_insert(*hash_table, "1", "-1");
-    g_hash_table_insert(*hash_table, "2", "-2");
+  *hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+  g_hash_table_insert (*hash_table, "-1", "1");
+  g_hash_table_insert (*hash_table, "0", "0");
+  g_hash_table_insert (*hash_table, "1", "-1");
+  g_hash_table_insert (*hash_table, "2", "-2");
 }
 
 /**
@@ -2982,11 +3008,11 @@ gi_marshalling_tests_ghashtable_utf8_container_out (GHashTable **hash_table)
 void
 gi_marshalling_tests_ghashtable_utf8_full_out (GHashTable **hash_table)
 {
-    *hash_table = g_hash_table_new(g_str_hash, g_str_equal);
-    g_hash_table_insert(*hash_table, g_strdup("-1"), g_strdup("1"));
-    g_hash_table_insert(*hash_table, g_strdup("0"), g_strdup("0"));
-    g_hash_table_insert(*hash_table, g_strdup("1"), g_strdup("-1"));
-    g_hash_table_insert(*hash_table, g_strdup("2"), g_strdup("-2"));
+  *hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+  g_hash_table_insert (*hash_table, g_strdup ("-1"), g_strdup ("1"));
+  g_hash_table_insert (*hash_table, g_strdup ("0"), g_strdup ("0"));
+  g_hash_table_insert (*hash_table, g_strdup ("1"), g_strdup ("-1"));
+  g_hash_table_insert (*hash_table, g_strdup ("2"), g_strdup ("-2"));
 }
 
 /**
@@ -2996,21 +3022,22 @@ gi_marshalling_tests_ghashtable_utf8_full_out (GHashTable **hash_table)
 void
 gi_marshalling_tests_ghashtable_utf8_none_inout (GHashTable **hash_table)
 {
-    static GHashTable *new_hash_table = NULL;
+  static GHashTable *new_hash_table = NULL;
 
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "-1"), ==, "1");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "0"), ==, "0");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "1"), ==, "-1");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "2"), ==, "-2");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "-1"), ==, "1");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "0"), ==, "0");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "1"), ==, "-1");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "2"), ==, "-2");
 
-    if (new_hash_table == NULL) {
-        new_hash_table = g_hash_table_new(g_str_hash, g_str_equal);
-        g_hash_table_insert(new_hash_table, "-1", "1");
-        g_hash_table_insert(new_hash_table, "0", "0");
-        g_hash_table_insert(new_hash_table, "1", "1");
+  if (new_hash_table == NULL)
+    {
+      new_hash_table = g_hash_table_new (g_str_hash, g_str_equal);
+      g_hash_table_insert (new_hash_table, "-1", "1");
+      g_hash_table_insert (new_hash_table, "0", "0");
+      g_hash_table_insert (new_hash_table, "1", "1");
     }
 
-    *hash_table = new_hash_table;
+  *hash_table = new_hash_table;
 }
 
 /**
@@ -3020,18 +3047,18 @@ gi_marshalling_tests_ghashtable_utf8_none_inout (GHashTable **hash_table)
 void
 gi_marshalling_tests_ghashtable_utf8_container_inout (GHashTable **hash_table)
 {
-    GHashTable *result = g_hash_table_new(g_str_hash, g_str_equal);
+  GHashTable *result = g_hash_table_new (g_str_hash, g_str_equal);
 
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "-1"), ==, "1");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "0"), ==, "0");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "1"), ==, "-1");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "2"), ==, "-2");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "-1"), ==, "1");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "0"), ==, "0");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "1"), ==, "-1");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "2"), ==, "-2");
 
-    g_hash_table_insert(result, "-1", "1");
-    g_hash_table_insert(result, "0", "0");
-    g_hash_table_insert(result, "1", "1");
+  g_hash_table_insert (result, "-1", "1");
+  g_hash_table_insert (result, "0", "0");
+  g_hash_table_insert (result, "1", "1");
 
-    *hash_table = result;
+  *hash_table = result;
 }
 
 /**
@@ -3041,19 +3068,19 @@ gi_marshalling_tests_ghashtable_utf8_container_inout (GHashTable **hash_table)
 void
 gi_marshalling_tests_ghashtable_utf8_full_inout (GHashTable **hash_table)
 {
-    GHashTable *result = g_hash_table_new_full(g_str_hash, g_str_equal,
-					       g_free, g_free);
+  GHashTable *result = g_hash_table_new_full (g_str_hash, g_str_equal,
+                                              g_free, g_free);
 
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "-1"), ==, "1");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "0"), ==, "0");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "1"), ==, "-1");
-    g_assert_cmpstr(g_hash_table_lookup(*hash_table, "2"), ==, "-2");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "-1"), ==, "1");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "0"), ==, "0");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "1"), ==, "-1");
+  g_assert_cmpstr (g_hash_table_lookup (*hash_table, "2"), ==, "-2");
 
-    g_hash_table_insert(result, g_strdup("-1"), g_strdup("1"));
-    g_hash_table_insert(result, g_strdup("0"), g_strdup("0"));
-    g_hash_table_insert(result, g_strdup("1"), g_strdup("1"));
+  g_hash_table_insert (result, g_strdup ("-1"), g_strdup ("1"));
+  g_hash_table_insert (result, g_strdup ("0"), g_strdup ("0"));
+  g_hash_table_insert (result, g_strdup ("1"), g_strdup ("1"));
 
-    *hash_table = result;
+  *hash_table = result;
 }
 
 
@@ -3065,15 +3092,16 @@ gi_marshalling_tests_ghashtable_utf8_full_inout (GHashTable **hash_table)
 GValue *
 gi_marshalling_tests_gvalue_return (void)
 {
-    static GValue *value = NULL;
+  static GValue *value = NULL;
 
-    if (value == NULL) {
-        value = g_new0(GValue, 1);
-        g_value_init(value, G_TYPE_INT);
-        g_value_set_int(value, 42);
+  if (value == NULL)
+    {
+      value = g_new0 (GValue, 1);
+      g_value_init (value, G_TYPE_INT);
+      g_value_set_int (value, 42);
     }
 
-    return value;
+  return value;
 }
 
 /**
@@ -3083,7 +3111,7 @@ gi_marshalling_tests_gvalue_return (void)
 void
 gi_marshalling_tests_gvalue_in (GValue *value)
 {
-    g_assert_cmpint(g_value_get_int(value), ==, 42);
+  g_assert_cmpint (g_value_get_int (value), ==, 42);
 }
 
 /**
@@ -3093,7 +3121,7 @@ gi_marshalling_tests_gvalue_in (GValue *value)
 void
 gi_marshalling_tests_gvalue_int64_in (GValue *value)
 {
-    g_assert_cmpint(g_value_get_int64(value), ==, G_MAXINT64);
+  g_assert_cmpint (g_value_get_int64 (value), ==, G_MAXINT64);
 }
 
 /**
@@ -3104,7 +3132,7 @@ gi_marshalling_tests_gvalue_int64_in (GValue *value)
 void
 gi_marshalling_tests_gvalue_in_with_type (GValue *value, GType type)
 {
-  g_assert(g_type_is_a(G_VALUE_TYPE(value), type));
+  g_assert (g_type_is_a (G_VALUE_TYPE (value), type));
 }
 
 /**
@@ -3114,7 +3142,7 @@ gi_marshalling_tests_gvalue_in_with_type (GValue *value, GType type)
 void
 gi_marshalling_tests_gvalue_in_enum (GValue *value)
 {
-    g_assert(g_value_get_enum(value) == GI_MARSHALLING_TESTS_ENUM_VALUE3);
+  g_assert (g_value_get_enum (value) == GI_MARSHALLING_TESTS_ENUM_VALUE3);
 }
 
 /**
@@ -3124,15 +3152,16 @@ gi_marshalling_tests_gvalue_in_enum (GValue *value)
 void
 gi_marshalling_tests_gvalue_out (GValue **value)
 {
-    static GValue *new_value = NULL;
+  static GValue *new_value = NULL;
 
-    if (new_value == NULL) {
-        new_value = g_new0(GValue, 1);
-        g_value_init(new_value, G_TYPE_INT);
-        g_value_set_int(new_value, 42);
+  if (new_value == NULL)
+    {
+      new_value = g_new0 (GValue, 1);
+      g_value_init (new_value, G_TYPE_INT);
+      g_value_set_int (new_value, 42);
     }
 
-    *value = new_value;
+  *value = new_value;
 }
 
 /**
@@ -3142,15 +3171,16 @@ gi_marshalling_tests_gvalue_out (GValue **value)
 void
 gi_marshalling_tests_gvalue_int64_out (GValue **value)
 {
-    static GValue *new_value = NULL;
+  static GValue *new_value = NULL;
 
-    if (new_value == NULL) {
-        new_value = g_new0(GValue, 1);
-        g_value_init(new_value, G_TYPE_INT64);
-        g_value_set_int64(new_value, G_MAXINT64);
+  if (new_value == NULL)
+    {
+      new_value = g_new0 (GValue, 1);
+      g_value_init (new_value, G_TYPE_INT64);
+      g_value_set_int64 (new_value, G_MAXINT64);
     }
 
-    *value = new_value;
+  *value = new_value;
 }
 
 /**
@@ -3160,8 +3190,8 @@ gi_marshalling_tests_gvalue_int64_out (GValue **value)
 void
 gi_marshalling_tests_gvalue_out_caller_allocates (GValue *value)
 {
-    g_value_init(value, G_TYPE_INT);
-    g_value_set_int(value, 42);
+  g_value_init (value, G_TYPE_INT);
+  g_value_set_int (value, 42);
 }
 
 /**
@@ -3171,10 +3201,10 @@ gi_marshalling_tests_gvalue_out_caller_allocates (GValue *value)
 void
 gi_marshalling_tests_gvalue_inout (GValue **value)
 {
-    g_assert_cmpint(g_value_get_int(*value), ==, 42);
-    g_value_unset(*value);
-    g_value_init(*value, G_TYPE_STRING);
-    g_value_set_string(*value, "42");
+  g_assert_cmpint (g_value_get_int (*value), ==, 42);
+  g_value_unset (*value);
+  g_value_init (*value, G_TYPE_STRING);
+  g_value_set_string (*value, "42");
 }
 
 /**
@@ -3183,14 +3213,13 @@ gi_marshalling_tests_gvalue_inout (GValue **value)
  * @values: (array length=n_values): an array containing values
  */
 void
-gi_marshalling_tests_gvalue_flat_array (guint         n_values,
-                                        const GValue *values)
+gi_marshalling_tests_gvalue_flat_array (guint n_values, const GValue *values)
 {
-    g_assert (n_values == 3);
+  g_assert (n_values == 3);
 
-    g_assert_cmpint (g_value_get_int (&values[0]), ==, 42);
-    g_assert_cmpstr (g_value_get_string (&values[1]), ==, "42");
-    g_assert_cmpint (g_value_get_boolean (&values[2]), ==, TRUE);
+  g_assert_cmpint (g_value_get_int (&values[0]), ==, 42);
+  g_assert_cmpstr (g_value_get_string (&values[1]), ==, "42");
+  g_assert_cmpint (g_value_get_boolean (&values[2]), ==, TRUE);
 }
 
 /**
@@ -3201,18 +3230,18 @@ gi_marshalling_tests_gvalue_flat_array (guint         n_values,
 GValue *
 gi_marshalling_tests_return_gvalue_flat_array (void)
 {
-    GValue *array = g_new0 (GValue, 3);
+  GValue *array = g_new0 (GValue, 3);
 
-    g_value_init (&array[0], G_TYPE_INT);
-    g_value_set_int (&array[0], 42);
+  g_value_init (&array[0], G_TYPE_INT);
+  g_value_set_int (&array[0], 42);
 
-    g_value_init (&array[1], G_TYPE_STRING);
-    g_value_set_static_string (&array[1], "42");
+  g_value_init (&array[1], G_TYPE_STRING);
+  g_value_set_static_string (&array[1], "42");
 
-    g_value_init (&array[2], G_TYPE_BOOLEAN);
-    g_value_set_boolean (&array[2], TRUE);
+  g_value_init (&array[2], G_TYPE_BOOLEAN);
+  g_value_set_boolean (&array[2], TRUE);
 
-    return array;
+  return array;
 }
 
 /**
@@ -3224,16 +3253,14 @@ gi_marshalling_tests_return_gvalue_flat_array (void)
  * Returns: (array fixed-size=3) (transfer full): a flat array of [@one, @two, @three]
  */
 GValue *
-gi_marshalling_tests_gvalue_flat_array_round_trip (const GValue one,
-                                                   const GValue two,
-                                                   const GValue three)
+gi_marshalling_tests_gvalue_flat_array_round_trip (const GValue one, const GValue two, const GValue three)
 {
-    GValue *array = g_new (GValue, 3);
-    array[0] = one;
-    array[1] = two;
-    array[2] = three;
+  GValue *array = g_new (GValue, 3);
+  array[0] = one;
+  array[1] = two;
+  array[2] = three;
 
-    return array;
+  return array;
 }
 
 /**
@@ -3243,18 +3270,15 @@ gi_marshalling_tests_gvalue_flat_array_round_trip (const GValue one,
 void
 gi_marshalling_tests_gclosure_in (GClosure *closure)
 {
-    GValue return_value = {0, };
+  GValue return_value = { 0, };
 
-    g_value_init (&return_value, G_TYPE_INT);
+  g_value_init (&return_value, G_TYPE_INT);
 
-    g_closure_invoke (closure,
-            &return_value,
-            0, NULL,
-            NULL);
+  g_closure_invoke (closure, &return_value, 0, NULL, NULL);
 
-    g_assert_cmpint(g_value_get_int (&return_value), ==, 42);
+  g_assert_cmpint (g_value_get_int (&return_value), ==, 42);
 
-    g_value_unset(&return_value);
+  g_value_unset (&return_value);
 }
 
 static gint
@@ -3266,17 +3290,14 @@ _closure_return_42 (void)
 static void
 _marshal_INT__VOID (GClosure *closure,
                     GValue *return_value,
-                    guint n_param_values,
-                    const GValue *param_values,
-                    gpointer invocation_hint,
-                    gpointer marshal_data)
+                    guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data)
 {
   typedef gint (*GMarshalFunc_INT__VOID) (void);
   register GMarshalFunc_INT__VOID callback;
-  register GCClosure *cc = (GCClosure*) closure;
+  register GCClosure *cc = (GCClosure *) closure;
 
   callback = (GMarshalFunc_INT__VOID) cc->callback;
-  g_value_set_int(return_value, callback());
+  g_value_set_int (return_value, callback ());
 }
 
 /**
@@ -3287,11 +3308,11 @@ _marshal_INT__VOID (GClosure *closure,
 GClosure *
 gi_marshalling_tests_gclosure_return (void)
 {
-    GClosure *closure = g_cclosure_new ((GCallback)_closure_return_42,
-                                        NULL, NULL);
-    g_closure_set_marshal (closure, _marshal_INT__VOID);
+  GClosure *closure = g_cclosure_new ((GCallback) _closure_return_42,
+                                      NULL, NULL);
+  g_closure_set_marshal (closure, _marshal_INT__VOID);
 
-    return closure;
+  return closure;
 }
 
 
@@ -3299,10 +3320,9 @@ gi_marshalling_tests_gclosure_return (void)
  * gi_marshalling_tests_callback_return_value_only:
  * @callback: (scope call):
  */
-glong
-gi_marshalling_tests_callback_return_value_only (GIMarshallingTestsCallbackReturnValueOnly callback)
+glong gi_marshalling_tests_callback_return_value_only (GIMarshallingTestsCallbackReturnValueOnly callback)
 {
-    return callback ();
+  return callback ();
 }
 
 /**
@@ -3310,11 +3330,9 @@ gi_marshalling_tests_callback_return_value_only (GIMarshallingTestsCallbackRetur
  * @callback: (scope call):
  * @a: (out):
  */
-void
-gi_marshalling_tests_callback_one_out_parameter (GIMarshallingTestsCallbackOneOutParameter  callback,
-                                                 gfloat                                    *a)
+void gi_marshalling_tests_callback_one_out_parameter (GIMarshallingTestsCallbackOneOutParameter callback, gfloat *a)
 {
-    callback (a);
+  callback (a);
 }
 
 /**
@@ -3324,11 +3342,10 @@ gi_marshalling_tests_callback_one_out_parameter (GIMarshallingTestsCallbackOneOu
  * @b: (out):
  */
 void
-gi_marshalling_tests_callback_multiple_out_parameters (GIMarshallingTestsCallbackMultipleOutParameters  callback,
-                                                       gfloat                                          *a,
-                                                       gfloat                                          *b)
+  gi_marshalling_tests_callback_multiple_out_parameters
+  (GIMarshallingTestsCallbackMultipleOutParameters callback, gfloat *a, gfloat *b)
 {
-    callback (a, b);
+  callback (a, b);
 }
 
 /**
@@ -3337,10 +3354,10 @@ gi_marshalling_tests_callback_multiple_out_parameters (GIMarshallingTestsCallbac
  * @a: (out):
  */
 glong
-gi_marshalling_tests_callback_return_value_and_one_out_parameter (GIMarshallingTestsCallbackReturnValueAndOneOutParameter  callback,
-                                                                  glong                                                   *a)
+  gi_marshalling_tests_callback_return_value_and_one_out_parameter
+  (GIMarshallingTestsCallbackReturnValueAndOneOutParameter callback, glong *a)
 {
-    return callback (a);
+  return callback (a);
 }
 
 /**
@@ -3350,11 +3367,10 @@ gi_marshalling_tests_callback_return_value_and_one_out_parameter (GIMarshallingT
  * @b: (out):
  */
 glong
-gi_marshalling_tests_callback_return_value_and_multiple_out_parameters (GIMarshallingTestsCallbackReturnValueAndMultipleOutParameters  callback,
-                                                                        glong                                                         *a,
-                                                                        glong                                                         *b)
+  gi_marshalling_tests_callback_return_value_and_multiple_out_parameters
+  (GIMarshallingTestsCallbackReturnValueAndMultipleOutParameters callback, glong *a, glong *b)
 {
-    return callback (a, b);
+  return callback (a, b);
 }
 
 
@@ -3367,36 +3383,40 @@ gi_marshalling_tests_callback_return_value_and_multiple_out_parameters (GIMarsha
 gpointer
 gi_marshalling_tests_pointer_in_return (gpointer pointer)
 {
-    return pointer;
+  return pointer;
 }
 
 GType
 gi_marshalling_tests_genum_get_type (void)
 {
-    static GType type = 0;
-    if (G_UNLIKELY(type == 0)) {
-        static const GEnumValue values[] = {
-            { GI_MARSHALLING_TESTS_GENUM_VALUE1, "GI_MARSHALLING_TESTS_GENUM_VALUE1", "value1" },
-            { GI_MARSHALLING_TESTS_GENUM_VALUE2, "GI_MARSHALLING_TESTS_GENUM_VALUE2", "value2" },
-            { GI_MARSHALLING_TESTS_GENUM_VALUE3, "GI_MARSHALLING_TESTS_GENUM_VALUE3", "value3" },
-            { 0, NULL, NULL }
-        };
-        type = g_enum_register_static (g_intern_static_string ("GIMarshallingTestsGEnum"), values);
+  static GType type = 0;
+  if (G_UNLIKELY (type == 0))
+    {
+      static const GEnumValue values[] = {
+        {GI_MARSHALLING_TESTS_GENUM_VALUE1,
+         "GI_MARSHALLING_TESTS_GENUM_VALUE1", "value1"},
+        {GI_MARSHALLING_TESTS_GENUM_VALUE2,
+         "GI_MARSHALLING_TESTS_GENUM_VALUE2", "value2"},
+        {GI_MARSHALLING_TESTS_GENUM_VALUE3,
+         "GI_MARSHALLING_TESTS_GENUM_VALUE3", "value3"},
+        {0, NULL, NULL}
+      };
+      type = g_enum_register_static (g_intern_static_string ("GIMarshallingTestsGEnum"), values);
     }
 
-    return type;
+  return type;
 }
 
 GIMarshallingTestsGEnum
 gi_marshalling_tests_genum_returnv (void)
 {
-    return GI_MARSHALLING_TESTS_GENUM_VALUE3;
+  return GI_MARSHALLING_TESTS_GENUM_VALUE3;
 }
 
 void
 gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum v)
 {
-    g_assert_cmpint(v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3);
+  g_assert_cmpint (v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3);
 }
 
 /**
@@ -3406,7 +3426,7 @@ gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum v)
 void
 gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *v)
 {
-    *v = GI_MARSHALLING_TESTS_GENUM_VALUE3;
+  *v = GI_MARSHALLING_TESTS_GENUM_VALUE3;
 }
 
 /**
@@ -3416,21 +3436,21 @@ gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *v)
 void
 gi_marshalling_tests_genum_inout (GIMarshallingTestsGEnum *v)
 {
-    g_assert_cmpint(*v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3);
-    *v = GI_MARSHALLING_TESTS_GENUM_VALUE1;
+  g_assert_cmpint (*v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3);
+  *v = GI_MARSHALLING_TESTS_GENUM_VALUE1;
 }
 
 
 GIMarshallingTestsEnum
 gi_marshalling_tests_enum_returnv (void)
 {
-    return GI_MARSHALLING_TESTS_ENUM_VALUE3;
+  return GI_MARSHALLING_TESTS_ENUM_VALUE3;
 }
 
 void
 gi_marshalling_tests_enum_in (GIMarshallingTestsEnum v)
 {
-    g_assert_cmpint(v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3);
+  g_assert_cmpint (v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3);
 }
 
 /**
@@ -3440,7 +3460,7 @@ gi_marshalling_tests_enum_in (GIMarshallingTestsEnum v)
 void
 gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *v)
 {
-    *v = GI_MARSHALLING_TESTS_ENUM_VALUE3;
+  *v = GI_MARSHALLING_TESTS_ENUM_VALUE3;
 }
 
 /**
@@ -3450,46 +3470,52 @@ gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *v)
 void
 gi_marshalling_tests_enum_inout (GIMarshallingTestsEnum *v)
 {
-    g_assert_cmpint(*v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3);
-    *v = GI_MARSHALLING_TESTS_ENUM_VALUE1;
+  g_assert_cmpint (*v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3);
+  *v = GI_MARSHALLING_TESTS_ENUM_VALUE1;
 }
 
 
 GType
 gi_marshalling_tests_flags_get_type (void)
 {
-    static GType type = 0;
-    if (G_UNLIKELY(type == 0)) {
-        static const GFlagsValue values[] = {
-            { GI_MARSHALLING_TESTS_FLAGS_VALUE1, "GI_MARSHALLING_TESTS_FLAGS_VALUE1", "value1" },
-            { GI_MARSHALLING_TESTS_FLAGS_VALUE2, "GI_MARSHALLING_TESTS_FLAGS_VALUE2", "value2" },
-            { GI_MARSHALLING_TESTS_FLAGS_VALUE3, "GI_MARSHALLING_TESTS_FLAGS_VALUE3", "value3" },
-            { GI_MARSHALLING_TESTS_FLAGS_MASK,   "GI_MARSHALLING_TESTS_FLAGS_MASK",   "mask"   },
-            { GI_MARSHALLING_TESTS_FLAGS_MASK2,  "GI_MARSHALLING_TESTS_FLAGS_MASK2",  "mask2"  },
-            { 0, NULL, NULL }
-        };
-        type = g_flags_register_static (g_intern_static_string ("GIMarshallingTestsFlags"), values);
+  static GType type = 0;
+  if (G_UNLIKELY (type == 0))
+    {
+      static const GFlagsValue values[] = {
+        {GI_MARSHALLING_TESTS_FLAGS_VALUE1,
+         "GI_MARSHALLING_TESTS_FLAGS_VALUE1", "value1"},
+        {GI_MARSHALLING_TESTS_FLAGS_VALUE2,
+         "GI_MARSHALLING_TESTS_FLAGS_VALUE2", "value2"},
+        {GI_MARSHALLING_TESTS_FLAGS_VALUE3,
+         "GI_MARSHALLING_TESTS_FLAGS_VALUE3", "value3"},
+        {GI_MARSHALLING_TESTS_FLAGS_MASK, "GI_MARSHALLING_TESTS_FLAGS_MASK",
+         "mask"},
+        {GI_MARSHALLING_TESTS_FLAGS_MASK2, "GI_MARSHALLING_TESTS_FLAGS_MASK2",
+         "mask2"},
+        {0, NULL, NULL}
+      };
+      type = g_flags_register_static (g_intern_static_string ("GIMarshallingTestsFlags"), values);
     }
 
-    return type;
+  return type;
 }
 
 GIMarshallingTestsFlags
 gi_marshalling_tests_flags_returnv (void)
 {
-    return GI_MARSHALLING_TESTS_FLAGS_VALUE2;
+  return GI_MARSHALLING_TESTS_FLAGS_VALUE2;
 }
 
 void
 gi_marshalling_tests_flags_in (GIMarshallingTestsFlags v)
 {
-    g_assert(v == GI_MARSHALLING_TESTS_FLAGS_VALUE2);
+  g_assert (v == GI_MARSHALLING_TESTS_FLAGS_VALUE2);
 }
 
 void
 gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags v)
 {
-    g_assert(v == 0);
+  g_assert (v == 0);
 }
 
 /**
@@ -3499,7 +3525,7 @@ gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags v)
 void
 gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *v)
 {
-    *v = GI_MARSHALLING_TESTS_FLAGS_VALUE2;
+  *v = GI_MARSHALLING_TESTS_FLAGS_VALUE2;
 }
 
 /**
@@ -3509,27 +3535,27 @@ gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *v)
 void
 gi_marshalling_tests_flags_inout (GIMarshallingTestsFlags *v)
 {
-    g_assert(*v == GI_MARSHALLING_TESTS_FLAGS_VALUE2);
-    *v = GI_MARSHALLING_TESTS_FLAGS_VALUE1;
+  g_assert (*v == GI_MARSHALLING_TESTS_FLAGS_VALUE2);
+  *v = GI_MARSHALLING_TESTS_FLAGS_VALUE1;
 }
 
 
 GIMarshallingTestsNoTypeFlags
 gi_marshalling_tests_no_type_flags_returnv (void)
 {
-    return GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2;
+  return GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2;
 }
 
 void
 gi_marshalling_tests_no_type_flags_in (GIMarshallingTestsNoTypeFlags v)
 {
-    g_assert(v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2);
+  g_assert (v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2);
 }
 
 void
 gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags v)
 {
-    g_assert(v == 0);
+  g_assert (v == 0);
 }
 
 /**
@@ -3539,7 +3565,7 @@ gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags v)
 void
 gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *v)
 {
-    *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2;
+  *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2;
 }
 
 /**
@@ -3549,8 +3575,8 @@ gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *v)
 void
 gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *v)
 {
-    g_assert(*v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2);
-    *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE1;
+  g_assert (*v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2);
+  *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE1;
 }
 
 
@@ -3562,16 +3588,17 @@ gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *v)
 GIMarshallingTestsSimpleStruct *
 gi_marshalling_tests_simple_struct_returnv (void)
 {
-    static GIMarshallingTestsSimpleStruct *struct_ = NULL;
+  static GIMarshallingTestsSimpleStruct *struct_ = NULL;
 
-    if (struct_ == NULL) {
-        struct_ = g_new(GIMarshallingTestsSimpleStruct, 1);
+  if (struct_ == NULL)
+    {
+      struct_ = g_new (GIMarshallingTestsSimpleStruct, 1);
 
-        struct_->long_ = 6;
-        struct_->int8 = 7;
+      struct_->long_ = 6;
+      struct_->int8 = 7;
     }
 
-    return struct_;
+  return struct_;
 }
 
 /**
@@ -3581,28 +3608,29 @@ gi_marshalling_tests_simple_struct_returnv (void)
 void
 gi_marshalling_tests_simple_struct_inv (GIMarshallingTestsSimpleStruct *struct_)
 {
-    g_assert_cmpint(struct_->long_, ==, 6);
-    g_assert_cmpint(struct_->int8, ==, 7);
+  g_assert_cmpint (struct_->long_, ==, 6);
+  g_assert_cmpint (struct_->int8, ==, 7);
 }
 
 void
 gi_marshalling_tests_simple_struct_method (GIMarshallingTestsSimpleStruct *struct_)
 {
-    g_assert_cmpint(struct_->long_, ==, 6);
-    g_assert_cmpint(struct_->int8, ==, 7);
+  g_assert_cmpint (struct_->long_, ==, 6);
+  g_assert_cmpint (struct_->int8, ==, 7);
 }
 
 
 GType
 gi_marshalling_tests_pointer_struct_get_type (void)
 {
-    static GType type = 0;
+  static GType type = 0;
 
-    if (type == 0) {
-        type = g_pointer_type_register_static ("GIMarshallingTestsPointerStruct");
+  if (type == 0)
+    {
+      type = g_pointer_type_register_static ("GIMarshallingTestsPointerStruct");
     }
 
-    return type;
+  return type;
 }
 
 /**
@@ -3613,15 +3641,16 @@ gi_marshalling_tests_pointer_struct_get_type (void)
 GIMarshallingTestsPointerStruct *
 gi_marshalling_tests_pointer_struct_returnv (void)
 {
-    static GIMarshallingTestsPointerStruct *struct_ = NULL;
+  static GIMarshallingTestsPointerStruct *struct_ = NULL;
 
-    if (struct_ == NULL) {
-        struct_ = g_new(GIMarshallingTestsPointerStruct, 1);
+  if (struct_ == NULL)
+    {
+      struct_ = g_new (GIMarshallingTestsPointerStruct, 1);
 
-        struct_->long_ = 42;
+      struct_->long_ = 42;
     }
 
-    return struct_;
+  return struct_;
 }
 
 /**
@@ -3631,66 +3660,69 @@ gi_marshalling_tests_pointer_struct_returnv (void)
 void
 gi_marshalling_tests_pointer_struct_inv (GIMarshallingTestsPointerStruct *struct_)
 {
-    g_assert_cmpint(struct_->long_, ==, 42);
+  g_assert_cmpint (struct_->long_, ==, 42);
 }
 
 static GIMarshallingTestsBoxedStruct *
 gi_marshalling_tests_boxed_struct_copy (GIMarshallingTestsBoxedStruct *struct_)
 {
-    GIMarshallingTestsBoxedStruct *new_struct;
+  GIMarshallingTestsBoxedStruct *new_struct;
 
-    if (struct_ == NULL)
-        return NULL;
+  if (struct_ == NULL)
+    return NULL;
 
-    new_struct = g_slice_new (GIMarshallingTestsBoxedStruct);
+  new_struct = g_slice_new (GIMarshallingTestsBoxedStruct);
 
-    *new_struct = *struct_;
-    new_struct->string_ = g_strdup (struct_->string_);
+  *new_struct = *struct_;
+  new_struct->string_ = g_strdup (struct_->string_);
 
-    return new_struct;
+  return new_struct;
 }
 
 static void
 gi_marshalling_tests_boxed_struct_free (GIMarshallingTestsBoxedStruct *struct_)
 {
-    if (struct_ != NULL) {
-        g_free (struct_->string_);
-        g_slice_free (GIMarshallingTestsBoxedStruct, struct_);
+  if (struct_ != NULL)
+    {
+      g_free (struct_->string_);
+      g_slice_free (GIMarshallingTestsBoxedStruct, struct_);
     }
 }
 
 GType
 gi_marshalling_tests_boxed_struct_get_type (void)
 {
-    static GType type = 0;
+  static GType type = 0;
 
-    if (type == 0) {
-        type = g_boxed_type_register_static ("GIMarshallingTestsBoxedStruct",
-                (GBoxedCopyFunc) gi_marshalling_tests_boxed_struct_copy,
-                (GBoxedFreeFunc) gi_marshalling_tests_boxed_struct_free);
+  if (type == 0)
+    {
+      type = g_boxed_type_register_static ("GIMarshallingTestsBoxedStruct",
+                                           (GBoxedCopyFunc)
+                                           gi_marshalling_tests_boxed_struct_copy,
+                                           (GBoxedFreeFunc) gi_marshalling_tests_boxed_struct_free);
     }
 
-    return type;
+  return type;
 }
 
 static GType
 gi_marshalling_tests_boxed_glist_get_type (void)
 {
-    static GType type = 0;
+  static GType type = 0;
 
-    if (type == 0) {
-        type = g_boxed_type_register_static ("GIMarshallingTestsBoxedGList",
-                (GBoxedCopyFunc) g_list_copy,
-                (GBoxedFreeFunc) g_list_free);
+  if (type == 0)
+    {
+      type = g_boxed_type_register_static ("GIMarshallingTestsBoxedGList",
+                                           (GBoxedCopyFunc) g_list_copy, (GBoxedFreeFunc) g_list_free);
     }
 
-    return type;
+  return type;
 }
 
 GIMarshallingTestsBoxedStruct *
 gi_marshalling_tests_boxed_struct_new (void)
 {
-    return g_slice_new0 (GIMarshallingTestsBoxedStruct);
+  return g_slice_new0 (GIMarshallingTestsBoxedStruct);
 }
 
 /**
@@ -3701,21 +3733,22 @@ gi_marshalling_tests_boxed_struct_new (void)
 GIMarshallingTestsBoxedStruct *
 gi_marshalling_tests_boxed_struct_returnv (void)
 {
-    static GIMarshallingTestsBoxedStruct *struct_ = NULL;
+  static GIMarshallingTestsBoxedStruct *struct_ = NULL;
 
-    if (struct_ == NULL) {
-        struct_ = g_new(GIMarshallingTestsBoxedStruct, 1);
+  if (struct_ == NULL)
+    {
+      struct_ = g_new (GIMarshallingTestsBoxedStruct, 1);
 
-        struct_->long_ = 42;
-        struct_->string_ = g_strdup("hello");
-        struct_->g_strv = g_new0(gchar*, 4);
-        struct_->g_strv[0] = g_strdup("0");
-        struct_->g_strv[1] = g_strdup("1");
-        struct_->g_strv[2] = g_strdup("2");
-        struct_->g_strv[3] = NULL;
+      struct_->long_ = 42;
+      struct_->string_ = g_strdup ("hello");
+      struct_->g_strv = g_new0 (gchar *, 4);
+      struct_->g_strv[0] = g_strdup ("0");
+      struct_->g_strv[1] = g_strdup ("1");
+      struct_->g_strv[2] = g_strdup ("2");
+      struct_->g_strv[3] = NULL;
     }
 
-    return struct_;
+  return struct_;
 }
 
 /**
@@ -3725,7 +3758,7 @@ gi_marshalling_tests_boxed_struct_returnv (void)
 void
 gi_marshalling_tests_boxed_struct_inv (GIMarshallingTestsBoxedStruct *struct_)
 {
-    g_assert_cmpint(struct_->long_, ==, 42);
+  g_assert_cmpint (struct_->long_, ==, 42);
 }
 
 /**
@@ -3735,15 +3768,16 @@ gi_marshalling_tests_boxed_struct_inv (GIMarshallingTestsBoxedStruct *struct_)
 void
 gi_marshalling_tests_boxed_struct_out (GIMarshallingTestsBoxedStruct **struct_)
 {
-    static GIMarshallingTestsBoxedStruct *new_struct = NULL;
+  static GIMarshallingTestsBoxedStruct *new_struct = NULL;
 
-    if (new_struct == NULL) {
-        new_struct = g_new0(GIMarshallingTestsBoxedStruct, 1);
+  if (new_struct == NULL)
+    {
+      new_struct = g_new0 (GIMarshallingTestsBoxedStruct, 1);
 
-        new_struct->long_ = 42;
+      new_struct->long_ = 42;
     }
 
-    *struct_ = new_struct;
+  *struct_ = new_struct;
 }
 
 /**
@@ -3753,42 +3787,44 @@ gi_marshalling_tests_boxed_struct_out (GIMarshallingTestsBoxedStruct **struct_)
 void
 gi_marshalling_tests_boxed_struct_inout (GIMarshallingTestsBoxedStruct **struct_)
 {
-    g_assert_cmpint((*struct_)->long_, ==, 42);
+  g_assert_cmpint ((*struct_)->long_, ==, 42);
 
-    (*struct_) = g_slice_new0 (GIMarshallingTestsBoxedStruct);
-    (*struct_)->long_ = 0;
+  (*struct_) = g_slice_new0 (GIMarshallingTestsBoxedStruct);
+  (*struct_)->long_ = 0;
 }
 
 static GIMarshallingTestsUnion *
 gi_marshalling_tests_union_copy (GIMarshallingTestsUnion *union_)
 {
-    GIMarshallingTestsUnion *new_union;
+  GIMarshallingTestsUnion *new_union;
 
-    new_union = g_slice_new (GIMarshallingTestsUnion);
+  new_union = g_slice_new (GIMarshallingTestsUnion);
 
-    *new_union = *union_;
+  *new_union = *union_;
 
-    return new_union;
+  return new_union;
 }
 
 static void
 gi_marshalling_tests_union_free (GIMarshallingTestsUnion *union_)
 {
-    g_slice_free (GIMarshallingTestsUnion, union_);
+  g_slice_free (GIMarshallingTestsUnion, union_);
 }
 
 GType
 gi_marshalling_tests_union_get_type (void)
 {
-    static GType type = 0;
+  static GType type = 0;
 
-    if (type == 0) {
-        type = g_boxed_type_register_static ("GIMarshallingTestsUnion",
-                (GBoxedCopyFunc) gi_marshalling_tests_union_copy,
-                (GBoxedFreeFunc) gi_marshalling_tests_union_free);
+  if (type == 0)
+    {
+      type = g_boxed_type_register_static ("GIMarshallingTestsUnion",
+                                           (GBoxedCopyFunc)
+                                           gi_marshalling_tests_union_copy,
+                                           (GBoxedFreeFunc) gi_marshalling_tests_union_free);
     }
 
-    return type;
+  return type;
 }
 
 /**
@@ -3799,15 +3835,16 @@ gi_marshalling_tests_union_get_type (void)
 GIMarshallingTestsUnion *
 gi_marshalling_tests_union_returnv (void)
 {
-    static GIMarshallingTestsUnion *union_ = NULL;
+  static GIMarshallingTestsUnion *union_ = NULL;
 
-    if (union_ == NULL) {
-        union_ = g_new(GIMarshallingTestsUnion, 1);
+  if (union_ == NULL)
+    {
+      union_ = g_new (GIMarshallingTestsUnion, 1);
 
-        union_->long_ = 42;
+      union_->long_ = 42;
     }
 
-    return union_;
+  return union_;
 }
 
 /**
@@ -3817,25 +3854,25 @@ gi_marshalling_tests_union_returnv (void)
 void
 gi_marshalling_tests_union_inv (GIMarshallingTestsUnion *union_)
 {
-    g_assert_cmpint(union_->long_, ==, 42);
+  g_assert_cmpint (union_->long_, ==, 42);
 }
 
 void
 gi_marshalling_tests_union_method (GIMarshallingTestsUnion *union_)
 {
-    g_assert_cmpint(union_->long_, ==, 42);
+  g_assert_cmpint (union_->long_, ==, 42);
 }
 
 
 
 enum
 {
-	PROP_0,
-	PROP_INT_
+  PROP_0,
+  PROP_INT_
 };
 
-static void gi_marshalling_tests_object_real_method_with_default_implementation (
-        GIMarshallingTestsObject *self, gint8 in);
+static void
+  gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in);
 
 G_DEFINE_TYPE (GIMarshallingTestsObject, gi_marshalling_tests_object, G_TYPE_OBJECT);
 
@@ -3847,56 +3884,60 @@ gi_marshalling_tests_object_init (GIMarshallingTestsObject *object)
 static void
 gi_marshalling_tests_object_finalize (GObject *object)
 {
-	G_OBJECT_CLASS (gi_marshalling_tests_object_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gi_marshalling_tests_object_parent_class)->finalize (object);
 }
 
 static void
 gi_marshalling_tests_object_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-	g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
+  g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
 
-	switch (prop_id) {
-        case PROP_INT_:
-            GI_MARSHALLING_TESTS_OBJECT (object)->int_ = g_value_get_int (value);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-            break;
-	}
+  switch (prop_id)
+    {
+    case PROP_INT_:
+      GI_MARSHALLING_TESTS_OBJECT (object)->int_ = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
 }
 
 static void
 gi_marshalling_tests_object_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
-	g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
+  g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
 
-	switch (prop_id) {
-        case PROP_INT_:
-            g_value_set_int (value, GI_MARSHALLING_TESTS_OBJECT (object)->int_);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-            break;
-	}
+  switch (prop_id)
+    {
+    case PROP_INT_:
+      g_value_set_int (value, GI_MARSHALLING_TESTS_OBJECT (object)->int_);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
 }
 
 static void
 gi_marshalling_tests_object_class_init (GIMarshallingTestsObjectClass *klass)
 {
-	GObjectClass* object_class = G_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 #if 0
-	GObjectClass* parent_class = G_OBJECT_CLASS (klass);
+  GObjectClass *parent_class = G_OBJECT_CLASS (klass);
 #endif
 
-	object_class->finalize = gi_marshalling_tests_object_finalize;
-	object_class->set_property = gi_marshalling_tests_object_set_property;
-	object_class->get_property = gi_marshalling_tests_object_get_property;
+  object_class->finalize = gi_marshalling_tests_object_finalize;
+  object_class->set_property = gi_marshalling_tests_object_set_property;
+  object_class->get_property = gi_marshalling_tests_object_get_property;
 
-	g_object_class_install_property (object_class, PROP_INT_,
-         g_param_spec_int ("int", "Integer", "An integer", G_MININT, G_MAXINT, 0,
-              G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+  g_object_class_install_property (object_class, PROP_INT_,
+                                   g_param_spec_int ("int", "Integer",
+                                                     "An integer", G_MININT,
+                                                     G_MAXINT, 0,
+                                                     G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
 
-    klass->method_with_default_implementation = gi_marshalling_tests_object_real_method_with_default_implementation;
+  klass->method_with_default_implementation = gi_marshalling_tests_object_real_method_with_default_implementation;
 }
 
 
@@ -3908,21 +3949,21 @@ gi_marshalling_tests_object_static_method (void)
 void
 gi_marshalling_tests_object_method (GIMarshallingTestsObject *object)
 {
-	g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
-    g_assert_cmpint (object->int_, ==, 42);
+  g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
+  g_assert_cmpint (object->int_, ==, 42);
 }
 
 void
 gi_marshalling_tests_object_overridden_method (GIMarshallingTestsObject *object)
 {
-	g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
-    g_assert_cmpint (object->int_, ==, 0);
+  g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object));
+  g_assert_cmpint (object->int_, ==, 0);
 }
 
 GIMarshallingTestsObject *
 gi_marshalling_tests_object_new (gint int_)
 {
-    return g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, "int", int_, NULL);
+  return g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, "int", int_, NULL);
 }
 
 /**
@@ -3932,11 +3973,11 @@ gi_marshalling_tests_object_new (gint int_)
 void
 gi_marshalling_tests_object_method_array_in (GIMarshallingTestsObject *object, const gint *ints, gint length)
 {
-    g_assert_cmpint(length, ==, 4);
-    g_assert_cmpint(ints[0], ==, -1);
-    g_assert_cmpint(ints[1], ==, 0);
-    g_assert_cmpint(ints[2], ==, 1);
-    g_assert_cmpint(ints[3], ==, 2);
+  g_assert_cmpint (length, ==, 4);
+  g_assert_cmpint (ints[0], ==, -1);
+  g_assert_cmpint (ints[1], ==, 0);
+  g_assert_cmpint (ints[2], ==, 1);
+  g_assert_cmpint (ints[3], ==, 2);
 }
 
 /**
@@ -3946,10 +3987,10 @@ gi_marshalling_tests_object_method_array_in (GIMarshallingTestsObject *object, c
 void
 gi_marshalling_tests_object_method_array_out (GIMarshallingTestsObject *object, gint **ints, gint *length)
 {
-    static gint values[] = {-1, 0, 1, 2};
+  static gint values[] = { -1, 0, 1, 2 };
 
-    *length = 4;
-    *ints = values;
+  *length = 4;
+  *ints = values;
 }
 
 /**
@@ -3960,16 +4001,16 @@ gi_marshalling_tests_object_method_array_out (GIMarshallingTestsObject *object,
 void
 gi_marshalling_tests_object_method_array_inout (GIMarshallingTestsObject *object, gint **ints, gint *length)
 {
-    static gint values[] = {-2, -1, 0, 1, 2};
+  static gint values[] = { -2, -1, 0, 1, 2 };
 
-    g_assert_cmpint(*length, ==, 4);
-    g_assert_cmpint((*ints)[0], ==, -1);
-    g_assert_cmpint((*ints)[1], ==, 0);
-    g_assert_cmpint((*ints)[2], ==, 1);
-    g_assert_cmpint((*ints)[3], ==, 2);
+  g_assert_cmpint (*length, ==, 4);
+  g_assert_cmpint ((*ints)[0], ==, -1);
+  g_assert_cmpint ((*ints)[1], ==, 0);
+  g_assert_cmpint ((*ints)[2], ==, 1);
+  g_assert_cmpint ((*ints)[3], ==, 2);
 
-    *length = 5;
-    *ints = values;
+  *length = 5;
+  *ints = values;
 }
 
 /**
@@ -3980,10 +4021,10 @@ gi_marshalling_tests_object_method_array_inout (GIMarshallingTestsObject *object
 const gint *
 gi_marshalling_tests_object_method_array_return (GIMarshallingTestsObject *object, gint *length)
 {
-    static gint ints[] = {-1, 0, 1, 2};
+  static gint ints[] = { -1, 0, 1, 2 };
 
-    *length = 4;
-    return ints;
+  *length = 4;
+  return ints;
 }
 
 /**
@@ -4011,7 +4052,7 @@ gi_marshalling_tests_object_method_int8_out (GIMarshallingTestsObject *self, gin
  * @out: (out caller-allocates):
  */
 void
-gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsObject *self, gint8 arg, gint8 *out)
+  gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsObject *self, gint8 arg, gint8 *out)
 {
   GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_int8_arg_and_out_caller (self, arg, out);
 }
@@ -4021,7 +4062,7 @@ gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsOb
  * @out: (out):
  */
 void
-gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsObject *self, gint8 arg, gint8 **out)
+  gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsObject *self, gint8 arg, gint8 **out)
 {
   GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_int8_arg_and_out_callee (self, arg, out);
 }
@@ -4032,8 +4073,8 @@ gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsOb
  *
  * Returns: (transfer none)
  */
-const gchar*
-gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *self, const gchar* arg, guint *out)
+const gchar *
+gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *self, const gchar *arg, guint *out)
 {
   return GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_str_arg_out_ret (self, arg, out);
 }
@@ -4042,19 +4083,18 @@ gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *se
  * gi_marshalling_tests_object_method_with_default_implementation:
  * @in: (in):
  */
-void
-gi_marshalling_tests_object_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in)
+void gi_marshalling_tests_object_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in)
 {
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_with_default_implementation (self, in);
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_with_default_implementation (self, in);
 }
 
 static void
-gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in)
+  gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in)
 {
-    GValue val = {0, };
-    g_value_init (&val, G_TYPE_INT);
-    g_value_set_int (&val, in);
-    g_object_set_property (G_OBJECT (self), "int", &val);
+  GValue val = { 0, };
+  g_value_init (&val, G_TYPE_INT);
+  g_value_set_int (&val, in);
+  g_object_set_property (G_OBJECT (self), "int", &val);
 }
 
 /**
@@ -4065,9 +4105,8 @@ gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshalli
  * Virtual: vfunc_with_callback
  */
 void
-gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject *object,
-                                                 GIMarshallingTestsCallbackIntInt callback,
-                                                 void *callback_data)
+gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject *
+                                                 object, GIMarshallingTestsCallbackIntInt callback, void *callback_data)
 {
 
 }
@@ -4075,16 +4114,14 @@ gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject *objec
 static int
 _callback (int val, void *user_data)
 {
-  g_assert (user_data == (gpointer)0xdeadbeef);
+  g_assert (user_data == (gpointer) 0xdeadbeef);
   return val;
 }
 
 void
 gi_marshalling_tests_object_call_vfunc_with_callback (GIMarshallingTestsObject *object)
 {
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (object)->vfunc_with_callback (object,
-                                                                         _callback,
-                                                                         (void *) 0xdeadbeef);
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (object)->vfunc_with_callback (object, _callback, (void *) 0xdeadbeef);
 }
 
 /**
@@ -4095,13 +4132,14 @@ gi_marshalling_tests_object_call_vfunc_with_callback (GIMarshallingTestsObject *
 GIMarshallingTestsObject *
 gi_marshalling_tests_object_none_return (void)
 {
-    static GIMarshallingTestsObject *object = NULL;
+  static GIMarshallingTestsObject *object = NULL;
 
-    if (object == NULL) {
-        object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
+  if (object == NULL)
+    {
+      object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
     }
 
-    return object;
+  return object;
 }
 
 /**
@@ -4112,7 +4150,7 @@ gi_marshalling_tests_object_none_return (void)
 GIMarshallingTestsObject *
 gi_marshalling_tests_object_full_return (void)
 {
-    return g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
+  return g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
 }
 
 /**
@@ -4122,7 +4160,7 @@ gi_marshalling_tests_object_full_return (void)
 void
 gi_marshalling_tests_object_none_in (GIMarshallingTestsObject *object)
 {
-    g_assert_cmpint(object->int_, ==, 42);
+  g_assert_cmpint (object->int_, ==, 42);
 }
 
 /**
@@ -4132,13 +4170,14 @@ gi_marshalling_tests_object_none_in (GIMarshallingTestsObject *object)
 void
 gi_marshalling_tests_object_none_out (GIMarshallingTestsObject **object)
 {
-    static GIMarshallingTestsObject *new_object = NULL;
+  static GIMarshallingTestsObject *new_object = NULL;
 
-    if (new_object == NULL) {
-        new_object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
+  if (new_object == NULL)
+    {
+      new_object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
     }
 
-    *object = new_object;
+  *object = new_object;
 }
 
 /**
@@ -4148,7 +4187,7 @@ gi_marshalling_tests_object_none_out (GIMarshallingTestsObject **object)
 void
 gi_marshalling_tests_object_full_out (GIMarshallingTestsObject **object)
 {
-    *object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
+  *object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
 }
 
 /**
@@ -4158,16 +4197,17 @@ gi_marshalling_tests_object_full_out (GIMarshallingTestsObject **object)
 void
 gi_marshalling_tests_object_none_inout (GIMarshallingTestsObject **object)
 {
-    static GIMarshallingTestsObject *new_object = NULL;
+  static GIMarshallingTestsObject *new_object = NULL;
 
-    g_assert_cmpint((*object)->int_, ==, 42);
+  g_assert_cmpint ((*object)->int_, ==, 42);
 
-    if (new_object == NULL) {
-        new_object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
-        new_object->int_ = 0;
+  if (new_object == NULL)
+    {
+      new_object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
+      new_object->int_ = 0;
     }
 
-    *object = new_object;
+  *object = new_object;
 }
 
 /**
@@ -4177,9 +4217,9 @@ gi_marshalling_tests_object_none_inout (GIMarshallingTestsObject **object)
 void
 gi_marshalling_tests_object_full_inout (GIMarshallingTestsObject **object)
 {
-    g_assert_cmpint((*object)->int_, ==, 42);
+  g_assert_cmpint ((*object)->int_, ==, 42);
 
-    *object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
+  *object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL);
 }
 
 /**
@@ -4208,12 +4248,12 @@ gi_marshalling_tests_object_int8_out (GIMarshallingTestsObject *object, gint8 *o
 glong
 gi_marshalling_tests_object_vfunc_return_value_only (GIMarshallingTestsObject *self)
 {
-    /* make sure that local variables don't get smashed */
-    glong return_value;
-    gulong local = 0x12345678;
-    return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_only (self);
-    g_assert_cmpint(local, ==, 0x12345678);
-    return return_value;
+  /* make sure that local variables don't get smashed */
+  glong return_value;
+  gulong local = 0x12345678;
+  return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_only (self);
+  g_assert_cmpint (local, ==, 0x12345678);
+  return return_value;
 }
 
 /**
@@ -4223,10 +4263,10 @@ gi_marshalling_tests_object_vfunc_return_value_only (GIMarshallingTestsObject *s
 void
 gi_marshalling_tests_object_vfunc_one_out_parameter (GIMarshallingTestsObject *self, gfloat *a)
 {
-    /* make sure that local variables don't get smashed */
-    gulong local = 0x12345678;
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_one_out_parameter (self, a);
-    g_assert_cmpint(local, ==, 0x12345678);
+  /* make sure that local variables don't get smashed */
+  gulong local = 0x12345678;
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_one_out_parameter (self, a);
+  g_assert_cmpint (local, ==, 0x12345678);
 }
 
 /**
@@ -4234,54 +4274,50 @@ gi_marshalling_tests_object_vfunc_one_out_parameter (GIMarshallingTestsObject *s
  * @a: (out):
  * @b: (out):
  */
-void
-gi_marshalling_tests_object_vfunc_multiple_out_parameters (GIMarshallingTestsObject *self, gfloat *a, gfloat *b)
+void gi_marshalling_tests_object_vfunc_multiple_out_parameters (GIMarshallingTestsObject *self, gfloat *a, gfloat *b)
 {
-    /* make sure that local variables don't get smashed */
-    gulong local = 0x12345678;
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_multiple_out_parameters (self, a, b);
-    g_assert_cmpint(local, ==, 0x12345678);
+  /* make sure that local variables don't get smashed */
+  gulong local = 0x12345678;
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_multiple_out_parameters (self, a, b);
+  g_assert_cmpint (local, ==, 0x12345678);
 }
 
 /**
  * gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter:
  * @a: (out):
  */
-void
-gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter (GIMarshallingTestsObject *self, GValue *a)
+void gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter (GIMarshallingTestsObject *self, GValue *a)
 {
-    /* make sure that local variables don't get smashed */
-    gulong local = 0x12345678;
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_caller_allocated_out_parameter (self, a);
-    g_assert_cmpint(local, ==, 0x12345678);
+  /* make sure that local variables don't get smashed */
+  gulong local = 0x12345678;
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_caller_allocated_out_parameter (self, a);
+  g_assert_cmpint (local, ==, 0x12345678);
 }
 
 /**
  * gi_marshalling_tests_object_vfunc_array_out_parameter:
  * @a: (out) (array zero-terminated=1):
  */
-void
-gi_marshalling_tests_object_vfunc_array_out_parameter (GIMarshallingTestsObject *self, gfloat **a)
+void gi_marshalling_tests_object_vfunc_array_out_parameter (GIMarshallingTestsObject *self, gfloat **a)
 {
-    /* make sure that local variables don't get smashed */
-    gulong local = 0x12345678;
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_array_out_parameter (self, a);
-    g_assert_cmpint(local, ==, 0x12345678);
+  /* make sure that local variables don't get smashed */
+  gulong local = 0x12345678;
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_array_out_parameter (self, a);
+  g_assert_cmpint (local, ==, 0x12345678);
 }
 
 /**
  * gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter:
  * @a: (out):
  */
-glong
-gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMarshallingTestsObject *self, glong *a)
+glong gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMarshallingTestsObject *self, glong *a)
 {
-    /* make sure that local variables don't get smashed */
-    gulong return_value;
-    gulong local = 0x12345678;
-    return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_one_out_parameter (self, a);
-    g_assert_cmpint(local, ==, 0x12345678);
-    return return_value;
+  /* make sure that local variables don't get smashed */
+  gulong return_value;
+  gulong local = 0x12345678;
+  return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_one_out_parameter (self, a);
+  g_assert_cmpint (local, ==, 0x12345678);
+  return return_value;
 }
 
 /**
@@ -4290,23 +4326,25 @@ gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMarshall
  * @b: (out):
  */
 glong
-gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters (GIMarshallingTestsObject *self, glong *a, glong *b)
+  gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters
+  (GIMarshallingTestsObject *self, glong *a, glong *b)
 {
-    gulong return_value;
-    gulong local = 0x12345678;
-    return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_multiple_out_parameters (self, a, b);
-    g_assert_cmpint(local, ==, 0x12345678);
-    return return_value;
+  gulong return_value;
+  gulong local = 0x12345678;
+  return_value =
+    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_multiple_out_parameters (self, a, b);
+  g_assert_cmpint (local, ==, 0x12345678);
+  return return_value;
 }
 
 gboolean
-gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *self,
-                                                   gint                      x,
-                                                   GError                  **error)
+gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *self, gint x, GError **error)
 {
   gulong local = 0x12345678;
-  gboolean ret = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_meth_with_err (self, x, error);
-  g_assert_cmpint(local, ==, 0x12345678);
+  gboolean ret = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_meth_with_err (self,
+                                                                                    x,
+                                                                                    error);
+  g_assert_cmpint (local, ==, 0x12345678);
   return ret;
 }
 
@@ -4327,15 +4365,16 @@ gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *sel
  * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call.
  */
 void
-gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
+  gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none
+  (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
 {
-    GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_none (self);
-    *ref_count = object->ref_count;
-    *is_floating = g_object_is_floating(object);
+  GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_none (self);
+  *ref_count = object->ref_count;
+  *is_floating = g_object_is_floating (object);
 
-    /* Attempt to sink and unref the returned object and avoid any potential leaks */
-    g_object_ref_sink(object);
-    g_object_unref(object);
+  /* Attempt to sink and unref the returned object and avoid any potential leaks */
+  g_object_ref_sink (object);
+  g_object_unref (object);
 }
 
 /**
@@ -4344,12 +4383,13 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none (
  * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call.
  */
 void
-gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
+  gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full
+  (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
 {
-    GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_full (self);
-    *ref_count = object->ref_count;
-    *is_floating = g_object_is_floating(object);
-    g_object_unref(object);
+  GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_full (self);
+  *ref_count = object->ref_count;
+  *is_floating = g_object_is_floating (object);
+  g_object_unref (object);
 }
 
 /**
@@ -4358,16 +4398,17 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full (
  * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call.
  */
 void
-gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
+  gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none
+  (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
 {
-    GObject *object = NULL;
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_none (self, &object);
-    *ref_count = object->ref_count;
-    *is_floating = g_object_is_floating(object);
+  GObject *object = NULL;
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_none (self, &object);
+  *ref_count = object->ref_count;
+  *is_floating = g_object_is_floating (object);
 
-    /* Attempt to sink and unref the returned object and avoid any potential leaks */
-    g_object_ref_sink(object);
-    g_object_unref(object);
+  /* Attempt to sink and unref the returned object and avoid any potential leaks */
+  g_object_ref_sink (object);
+  g_object_unref (object);
 }
 
 /**
@@ -4376,17 +4417,19 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none (GIM
  * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call.
  */
 void
-gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
+  gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full
+  (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating)
 {
-    GObject *object = NULL;
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_full (self, &object);
-    *ref_count = object->ref_count;
-    *is_floating = g_object_is_floating(object);
-    g_object_unref(object);
+  GObject *object = NULL;
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_full (self, &object);
+  *ref_count = object->ref_count;
+  *is_floating = g_object_is_floating (object);
+  g_object_unref (object);
 }
 
 static void
-_vfunc_in_object_destroy_callback(gboolean *destroy_called, GObject *where_the_object_was) {
+_vfunc_in_object_destroy_callback (gboolean *destroy_called, GObject *where_the_object_was)
+{
   *destroy_called = TRUE;
 }
 
@@ -4399,23 +4442,27 @@ _vfunc_in_object_destroy_callback(gboolean *destroy_called, GObject *where_the_o
  * Calls vfunc_in_object_transfer_none with a new object of the given type.
  */
 void
-gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating)
+  gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none
+  (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating)
 {
-    static gboolean destroy_called;
-    GObject *object;
-    destroy_called = FALSE;
+  static gboolean destroy_called;
+  GObject *object;
+  destroy_called = FALSE;
 
-    object = g_object_new(type, NULL);
-    g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called);
+  object = g_object_new (type, NULL);
+  g_object_weak_ref (object, (GWeakNotify) _vfunc_in_object_destroy_callback, &destroy_called);
 
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_none (self, object);
-    if (destroy_called) {
-        *ref_count = 0;
-        *is_floating = FALSE;
-    } else {
-        *ref_count = object->ref_count;
-        *is_floating = g_object_is_floating (object);
-        g_object_unref (object);
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_none (self, object);
+  if (destroy_called)
+    {
+      *ref_count = 0;
+      *is_floating = FALSE;
+    }
+  else
+    {
+      *ref_count = object->ref_count;
+      *is_floating = g_object_is_floating (object);
+      g_object_unref (object);
     }
 }
 
@@ -4427,25 +4474,29 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMa
  * @is_floating: (out): Floating state of in object directly after vfunc call.
  */
 void
-gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating)
+  gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full
+  (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating)
 {
-    static gboolean destroy_called;
-    GObject *object;
-    destroy_called = FALSE;
+  static gboolean destroy_called;
+  GObject *object;
+  destroy_called = FALSE;
 
-    object = g_object_new(type, NULL);
-    g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called);
+  object = g_object_new (type, NULL);
+  g_object_weak_ref (object, (GWeakNotify) _vfunc_in_object_destroy_callback, &destroy_called);
 
-    /* Calling the vfunc takes ownership of the object, so we use a weak_ref to determine
-     * if the object gets destroyed after the call and appropriately return 0 as the ref count.
-     */
-    GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_full (self, object);
-    if (destroy_called) {
-        *ref_count = 0;
-        *is_floating = FALSE;
-    } else {
-        *ref_count = object->ref_count;
-        *is_floating = g_object_is_floating (object);
+  /* Calling the vfunc takes ownership of the object, so we use a weak_ref to determine
+   * if the object gets destroyed after the call and appropriately return 0 as the ref count.
+   */
+  GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_full (self, object);
+  if (destroy_called)
+    {
+      *ref_count = 0;
+      *is_floating = FALSE;
+    }
+  else
+    {
+      *ref_count = object->ref_count;
+      *is_floating = g_object_is_floating (object);
     }
 }
 
@@ -4460,69 +4511,69 @@ gi_marshalling_tests_sub_object_init (GIMarshallingTestsSubObject *object)
 static void
 gi_marshalling_tests_sub_object_finalize (GObject *object)
 {
-	G_OBJECT_CLASS(gi_marshalling_tests_sub_object_parent_class)->finalize(object);
+  G_OBJECT_CLASS (gi_marshalling_tests_sub_object_parent_class)->finalize (object);
 }
 
 static void
 method_deep_hierarchy (GIMarshallingTestsObject *self, gint8 in)
 {
-    GValue val = {0, };
-    g_value_init (&val, G_TYPE_INT);
-    g_value_set_int (&val, in);
-    g_object_set_property (G_OBJECT (self), "int", &val);
+  GValue val = { 0, };
+  g_value_init (&val, G_TYPE_INT);
+  g_value_set_int (&val, in);
+  g_object_set_property (G_OBJECT (self), "int", &val);
 }
 
 static void
 gi_marshalling_tests_sub_object_class_init (GIMarshallingTestsSubObjectClass *klass)
 {
-	G_OBJECT_CLASS(klass)->finalize = gi_marshalling_tests_sub_object_finalize;
-    GI_MARSHALLING_TESTS_OBJECT_CLASS(klass)->method_deep_hierarchy = method_deep_hierarchy;
+  G_OBJECT_CLASS (klass)->finalize = gi_marshalling_tests_sub_object_finalize;
+  GI_MARSHALLING_TESTS_OBJECT_CLASS (klass)->method_deep_hierarchy = method_deep_hierarchy;
 }
 
 void
 gi_marshalling_tests_sub_object_sub_method (GIMarshallingTestsSubObject *object)
 {
-    g_assert_cmpint(GI_MARSHALLING_TESTS_OBJECT(object)->int_, ==, 0);
+  g_assert_cmpint (GI_MARSHALLING_TESTS_OBJECT (object)->int_, ==, 0);
 }
 
-void
-gi_marshalling_tests_sub_object_overwritten_method (GIMarshallingTestsSubObject *object)
+void gi_marshalling_tests_sub_object_overwritten_method (GIMarshallingTestsSubObject *object)
 {
-    g_assert_cmpint(GI_MARSHALLING_TESTS_OBJECT(object)->int_, ==, 0);
+  g_assert_cmpint (GI_MARSHALLING_TESTS_OBJECT (object)->int_, ==, 0);
 }
 
-G_DEFINE_TYPE (GIMarshallingTestsSubSubObject, gi_marshalling_tests_sub_sub_object, GI_MARSHALLING_TESTS_TYPE_SUB_OBJECT);
+G_DEFINE_TYPE (GIMarshallingTestsSubSubObject,
+               gi_marshalling_tests_sub_sub_object, GI_MARSHALLING_TESTS_TYPE_SUB_OBJECT);
 
 static void
 gi_marshalling_tests_sub_sub_object_init (GIMarshallingTestsSubSubObject *object)
 {
 }
 
-static void
-gi_marshalling_tests_sub_sub_object_class_init (GIMarshallingTestsSubSubObjectClass *klass)
+static void gi_marshalling_tests_sub_sub_object_class_init (GIMarshallingTestsSubSubObjectClass *klass)
 {
 }
 
 /* Interfaces */
 
 static void
-gi_marshalling_tests_interface_class_init(void *g_iface)
+gi_marshalling_tests_interface_class_init (void *g_iface)
 {
 }
 
 GType
-gi_marshalling_tests_interface_get_type(void)
-{
-    static GType type = 0;
-    if (type == 0) {
-        type = g_type_register_static_simple (G_TYPE_INTERFACE,
-                                              "GIMarshallingTestsInterface",
-                                              sizeof (GIMarshallingTestsInterfaceIface),
-                                              (GClassInitFunc) gi_marshalling_tests_interface_class_init,
-                                              0, NULL, 0);
+gi_marshalling_tests_interface_get_type (void)
+{
+  static GType type = 0;
+  if (type == 0)
+    {
+      type = g_type_register_static_simple (G_TYPE_INTERFACE,
+                                            "GIMarshallingTestsInterface",
+                                            sizeof
+                                            (GIMarshallingTestsInterfaceIface),
+                                            (GClassInitFunc) gi_marshalling_tests_interface_class_init, 0, NULL, 0);
     }
 
-    return type;
+  return type;
 }
 
 /**
@@ -4547,43 +4598,45 @@ gi_marshalling_tests_test_interface_test_int8_in (GIMarshallingTestsInterface *t
 
 
 static void
-gi_marshalling_tests_interface2_class_init(void *g_iface)
+gi_marshalling_tests_interface2_class_init (void *g_iface)
 {
 }
 
 GType
-gi_marshalling_tests_interface2_get_type(void)
-{
-    static GType type = 0;
-    if (type == 0) {
-        type = g_type_register_static_simple (G_TYPE_INTERFACE,
-                                              "GIMarshallingTestsInterface2",
-                                              sizeof (GIMarshallingTestsInterface2Iface),
-                                              (GClassInitFunc) gi_marshalling_tests_interface2_class_init,
-                                              0, NULL, 0);
+gi_marshalling_tests_interface2_get_type (void)
+{
+  static GType type = 0;
+  if (type == 0)
+    {
+      type = g_type_register_static_simple (G_TYPE_INTERFACE,
+                                            "GIMarshallingTestsInterface2",
+                                            sizeof
+                                            (GIMarshallingTestsInterface2Iface),
+                                            (GClassInitFunc) gi_marshalling_tests_interface2_class_init, 0, NULL, 0);
     }
 
-    return type;
+  return type;
 }
 
 static void
-gi_marshalling_tests_interface3_class_init(void *g_iface)
+gi_marshalling_tests_interface3_class_init (void *g_iface)
 {
 }
 
 GType
-gi_marshalling_tests_interface3_get_type(void)
-{
-    static GType type = 0;
-    if (type == 0) {
-        type = g_type_register_static_simple (G_TYPE_INTERFACE,
-                                              "GIMarshallingTestsInterface3",
-                                              sizeof (GIMarshallingTestsInterface3Iface),
-                                              (GClassInitFunc) gi_marshalling_tests_interface3_class_init,
-                                              0, NULL, 0);
+gi_marshalling_tests_interface3_get_type (void)
+{
+  static GType type = 0;
+  if (type == 0)
+    {
+      type = g_type_register_static_simple (G_TYPE_INTERFACE,
+                                            "GIMarshallingTestsInterface3",
+                                            sizeof
+                                            (GIMarshallingTestsInterface3Iface),
+                                            (GClassInitFunc) gi_marshalling_tests_interface3_class_init, 0, NULL, 0);
     }
 
-    return type;
+  return type;
 }
 
 /**
@@ -4592,9 +4645,8 @@ gi_marshalling_tests_interface3_get_type(void)
  * @n_in:
  */
 void
-gi_marshalling_tests_interface3_test_variant_array_in (GIMarshallingTestsInterface3 *self,
-                                                       GVariant **in,
-                                                       gsize n_in)
+  gi_marshalling_tests_interface3_test_variant_array_in
+  (GIMarshallingTestsInterface3 *self, GVariant **in, gsize n_in)
 {
   GI_MARSHALLING_TESTS_INTERFACE3_GET_IFACE (self)->test_variant_array_in (self, in, n_in);
 }
@@ -4607,8 +4659,8 @@ gi_marshalling_tests_interface3_test_variant_array_in (GIMarshallingTestsInterfa
 void
 gi_marshalling_tests_int_out_out (gint *int0, gint *int1)
 {
-    *int0 = 6;
-    *int1 = 7;
+  *int0 = 6;
+  *int1 = 7;
 }
 
 /**
@@ -4621,12 +4673,11 @@ gi_marshalling_tests_int_out_out (gint *int0, gint *int1)
  * @out2: (out):
  */
 void
-gi_marshalling_tests_int_three_in_three_out(gint a, gint b, gint c,
-                                            gint *out0, gint *out1, gint *out2)
+gi_marshalling_tests_int_three_in_three_out (gint a, gint b, gint c, gint *out0, gint *out1, gint *out2)
 {
-    *out0 = a;
-    *out1 = b;
-    *out2 = c;
+  *out0 = a;
+  *out1 = b;
+  *out2 = c;
 }
 
 /**
@@ -4636,20 +4687,18 @@ gi_marshalling_tests_int_three_in_three_out(gint a, gint b, gint c,
 gint
 gi_marshalling_tests_int_return_out (gint *int_)
 {
-    *int_ = 7;
-    return 6;
+  *int_ = 7;
+  return 6;
 }
 
 /* GError */
 
 void
-gi_marshalling_tests_gerror(GError **error)
+gi_marshalling_tests_gerror (GError **error)
 {
-    GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
-    g_set_error_literal(error,
-                        quark,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
+  GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
+  g_set_error_literal (error, quark,
+                       GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
 }
 
 /**
@@ -4657,13 +4706,11 @@ gi_marshalling_tests_gerror(GError **error)
  * @in_ints: (array zero-terminated=1):
  */
 void
-gi_marshalling_tests_gerror_array_in(gint *in_ints, GError **error)
+gi_marshalling_tests_gerror_array_in (gint *in_ints, GError **error)
 {
-    GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
-    g_set_error_literal(error,
-                        quark,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
+  GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
+  g_set_error_literal (error, quark,
+                       GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
 }
 
 /**
@@ -4674,16 +4721,15 @@ gi_marshalling_tests_gerror_array_in(gint *in_ints, GError **error)
  * Inspired by gst_message_parse_error.
  */
 void
-gi_marshalling_tests_gerror_out(GError **error, gchar **debug)
+gi_marshalling_tests_gerror_out (GError **error, gchar **debug)
 {
-    GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
-    g_set_error_literal(error,
-                        quark,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
+  GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
+  g_set_error_literal (error, quark,
+                       GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
 
-    if (debug != NULL) {
-        *debug = g_strdup (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE);
+  if (debug != NULL)
+    {
+      *debug = g_strdup (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE);
     }
 }
 
@@ -4696,14 +4742,15 @@ gi_marshalling_tests_gerror_out(GError **error, gchar **debug)
  * must not free.
  */
 void
-gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **debug)
+gi_marshalling_tests_gerror_out_transfer_none (GError **err, const gchar **debug)
 {
-    static GError error = { 0,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE,
-                        GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE };
-    error.domain = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
-    *err = &error;
-    *debug = GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE;
+  static GError error = { 0,
+    GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE,
+    GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE
+  };
+  error.domain = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
+  *err = &error;
+  *debug = GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE;
 }
 
 /**
@@ -4714,57 +4761,57 @@ gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **debug)
  * Returns: (transfer full): a GError
  */
 GError *
-gi_marshalling_tests_gerror_return(void)
+gi_marshalling_tests_gerror_return (void)
 {
-    GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
+  GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
 
-    return g_error_new(quark,
-                       GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE,
-                       GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
+  return g_error_new (quark, GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
 }
 
 static GIMarshallingTestsOverridesStruct *
 gi_marshalling_tests_overrides_struct_copy (GIMarshallingTestsOverridesStruct *struct_)
 {
-    GIMarshallingTestsOverridesStruct *new_struct;
+  GIMarshallingTestsOverridesStruct *new_struct;
 
-    new_struct = g_slice_new (GIMarshallingTestsOverridesStruct);
+  new_struct = g_slice_new (GIMarshallingTestsOverridesStruct);
 
-    *new_struct = *struct_;
+  *new_struct = *struct_;
 
-    return new_struct;
+  return new_struct;
 }
 
 static void
 gi_marshalling_tests_overrides_struct_free (GIMarshallingTestsOverridesStruct *struct_)
 {
-    g_slice_free (GIMarshallingTestsOverridesStruct, struct_);
+  g_slice_free (GIMarshallingTestsOverridesStruct, struct_);
 }
 
 GType
 gi_marshalling_tests_overrides_struct_get_type (void)
 {
-    static GType type = 0;
+  static GType type = 0;
 
-    if (type == 0) {
-        type = g_boxed_type_register_static ("GIMarshallingTestsOverridesStruct",
-                (GBoxedCopyFunc) gi_marshalling_tests_overrides_struct_copy,
-                (GBoxedFreeFunc) gi_marshalling_tests_overrides_struct_free);
+  if (type == 0)
+    {
+      type =
+        g_boxed_type_register_static ("GIMarshallingTestsOverridesStruct",
+                                      (GBoxedCopyFunc)
+                                      gi_marshalling_tests_overrides_struct_copy,
+                                      (GBoxedFreeFunc) gi_marshalling_tests_overrides_struct_free);
     }
 
-    return type;
+  return type;
 }
 
 GIMarshallingTestsOverridesStruct *
 gi_marshalling_tests_overrides_struct_new (void)
 {
-    return g_slice_new (GIMarshallingTestsOverridesStruct);
+  return g_slice_new (GIMarshallingTestsOverridesStruct);
 }
 
-glong
-gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct *struct_)
+glong gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct *struct_)
 {
-    return 42;
+  return 42;
 }
 
 
@@ -4776,7 +4823,7 @@ gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct
 GIMarshallingTestsOverridesStruct *
 gi_marshalling_tests_overrides_struct_returnv (void)
 {
-    return gi_marshalling_tests_overrides_struct_new();
+  return gi_marshalling_tests_overrides_struct_new ();
 }
 
 
@@ -4790,30 +4837,28 @@ gi_marshalling_tests_overrides_object_init (GIMarshallingTestsOverridesObject *o
 static void
 gi_marshalling_tests_overrides_object_finalize (GObject *object)
 {
-	G_OBJECT_CLASS (gi_marshalling_tests_overrides_object_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gi_marshalling_tests_overrides_object_parent_class)->finalize (object);
 }
 
-static void
-gi_marshalling_tests_overrides_object_class_init (GIMarshallingTestsOverridesObjectClass *klass)
+static void gi_marshalling_tests_overrides_object_class_init (GIMarshallingTestsOverridesObjectClass *klass)
 {
-	GObjectClass* object_class = G_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 #if 0
-	GObjectClass* parent_class = G_OBJECT_CLASS (klass);
+  GObjectClass *parent_class = G_OBJECT_CLASS (klass);
 #endif
 
-	object_class->finalize = gi_marshalling_tests_overrides_object_finalize;
+  object_class->finalize = gi_marshalling_tests_overrides_object_finalize;
 }
 
 GIMarshallingTestsOverridesObject *
 gi_marshalling_tests_overrides_object_new (void)
 {
-    return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL);
+  return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL);
 }
 
-glong
-gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject *object)
+glong gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject *object)
 {
-    return 42;
+  return 42;
 }
 
 /**
@@ -4824,7 +4869,7 @@ gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject
 GIMarshallingTestsOverridesObject *
 gi_marshalling_tests_overrides_object_returnv (void)
 {
-    return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL);
+  return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL);
 }
 
 /**
@@ -4835,7 +4880,7 @@ gi_marshalling_tests_overrides_object_returnv (void)
 GSList *
 gi_marshalling_tests_filename_list_return (void)
 {
-    return NULL;
+  return NULL;
 }
 
 /**
@@ -4844,9 +4889,9 @@ gi_marshalling_tests_filename_list_return (void)
 void
 gi_marshalling_tests_param_spec_in_bool (const GParamSpec *param)
 {
-    g_assert (G_IS_PARAM_SPEC (param));
-    g_assert_cmpint (G_PARAM_SPEC_TYPE (param), ==, G_TYPE_BOOLEAN);
-    g_assert_cmpstr (g_param_spec_get_name((GParamSpec*) param), ==, "mybool");
+  g_assert (G_IS_PARAM_SPEC (param));
+  g_assert_cmpint (G_PARAM_SPEC_TYPE (param), ==, G_TYPE_BOOLEAN);
+  g_assert_cmpstr (g_param_spec_get_name ((GParamSpec *) param), ==, "mybool");
 }
 
 /**
@@ -4857,7 +4902,7 @@ gi_marshalling_tests_param_spec_in_bool (const GParamSpec *param)
 GParamSpec *
 gi_marshalling_tests_param_spec_return (void)
 {
-    return g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE);
+  return g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE);
 }
 
 /**
@@ -4865,235 +4910,277 @@ gi_marshalling_tests_param_spec_return (void)
  * @param: (out):
  */
 void
-gi_marshalling_tests_param_spec_out(GParamSpec **param)
+gi_marshalling_tests_param_spec_out (GParamSpec **param)
 {
-    *param = g_param_spec_string("test-param", "test", "This is a test", "42", G_PARAM_READABLE);
+  *param = g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE);
 }
 
 
-enum  {
-    DUMMY_PROPERTY,
-    SOME_BOOLEAN_PROPERTY,
-    SOME_CHAR_PROPERTY,
-    SOME_UCHAR_PROPERTY,
-    SOME_INT_PROPERTY,
-    SOME_UINT_PROPERTY,
-    SOME_LONG_PROPERTY,
-    SOME_ULONG_PROPERTY,
-    SOME_INT64_PROPERTY,
-    SOME_UINT64_PROPERTY,
-    SOME_FLOAT_PROPERTY,
-    SOME_DOUBLE_PROPERTY,
-    SOME_STRV_PROPERTY,
-    SOME_BOXED_STRUCT_PROPERTY,
-    SOME_VARIANT_PROPERTY,
-    SOME_BOXED_GLIST_PROPERTY,
-    SOME_OBJECT_PROPERTY,
+enum
+{
+  DUMMY_PROPERTY,
+  SOME_BOOLEAN_PROPERTY,
+  SOME_CHAR_PROPERTY,
+  SOME_UCHAR_PROPERTY,
+  SOME_INT_PROPERTY,
+  SOME_UINT_PROPERTY,
+  SOME_LONG_PROPERTY,
+  SOME_ULONG_PROPERTY,
+  SOME_INT64_PROPERTY,
+  SOME_UINT64_PROPERTY,
+  SOME_FLOAT_PROPERTY,
+  SOME_DOUBLE_PROPERTY,
+  SOME_STRV_PROPERTY,
+  SOME_BOXED_STRUCT_PROPERTY,
+  SOME_VARIANT_PROPERTY,
+  SOME_BOXED_GLIST_PROPERTY,
+  SOME_OBJECT_PROPERTY,
 };
 
 G_DEFINE_TYPE (GIMarshallingTestsPropertiesObject, gi_marshalling_tests_properties_object, G_TYPE_OBJECT);
 
-static void
-gi_marshalling_tests_properties_object_init (GIMarshallingTestsPropertiesObject * self)
+static void gi_marshalling_tests_properties_object_init (GIMarshallingTestsPropertiesObject *self)
 {
 }
 
 static void
-gi_marshalling_tests_properties_object_finalize (GObject* obj)
+gi_marshalling_tests_properties_object_finalize (GObject *obj)
 {
-    G_OBJECT_CLASS (gi_marshalling_tests_properties_object_parent_class)->finalize (obj);
+  G_OBJECT_CLASS (gi_marshalling_tests_properties_object_parent_class)->finalize (obj);
 }
 
 static void
-gi_marshalling_tests_properties_object_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec)
-{
-    GIMarshallingTestsPropertiesObject * self;
-    self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object);
-    switch (property_id) {
-        case SOME_BOOLEAN_PROPERTY:
-            g_value_set_boolean (value, self->some_boolean);
-            break;
-        case SOME_CHAR_PROPERTY:
-            g_value_set_schar (value, self->some_char);
-            break;
-        case SOME_UCHAR_PROPERTY:
-            g_value_set_uchar (value, self->some_uchar);
-            break;
-        case SOME_INT_PROPERTY:
-            g_value_set_int (value, self->some_int);
-            break;
-        case SOME_UINT_PROPERTY:
-            g_value_set_uint (value, self->some_uint);
-            break;
-        case SOME_LONG_PROPERTY:
-            g_value_set_long (value, self->some_long);
-            break;
-        case SOME_ULONG_PROPERTY:
-            g_value_set_ulong (value, self->some_ulong);
-            break;
-        case SOME_INT64_PROPERTY:
-            g_value_set_int64 (value, self->some_int64);
-            break;
-        case SOME_UINT64_PROPERTY:
-            g_value_set_uint64 (value, self->some_uint64);
-            break;
-        case SOME_FLOAT_PROPERTY:
-            g_value_set_float (value, self->some_float);
-            break;
-        case SOME_DOUBLE_PROPERTY:
-            g_value_set_double (value, self->some_double);
-            break;
-        case SOME_STRV_PROPERTY:
-            g_value_set_boxed (value, self->some_strv);
-            break;
-        case SOME_BOXED_STRUCT_PROPERTY:
-            g_value_set_boxed (value, self->some_boxed_struct);
-            break;
-        case SOME_BOXED_GLIST_PROPERTY:
-            g_value_set_boxed (value, self->some_boxed_glist);
-            break;
-        case SOME_VARIANT_PROPERTY:
-            g_value_set_variant (value, self->some_variant);
-            break;
-        case SOME_OBJECT_PROPERTY:
-            g_value_set_object (value, self->some_object);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-            break;
+gi_marshalling_tests_properties_object_get_property (GObject *object,
+                                                     guint property_id, GValue *value, GParamSpec *pspec)
+{
+  GIMarshallingTestsPropertiesObject *self;
+  self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object);
+  switch (property_id)
+    {
+    case SOME_BOOLEAN_PROPERTY:
+      g_value_set_boolean (value, self->some_boolean);
+      break;
+    case SOME_CHAR_PROPERTY:
+      g_value_set_schar (value, self->some_char);
+      break;
+    case SOME_UCHAR_PROPERTY:
+      g_value_set_uchar (value, self->some_uchar);
+      break;
+    case SOME_INT_PROPERTY:
+      g_value_set_int (value, self->some_int);
+      break;
+    case SOME_UINT_PROPERTY:
+      g_value_set_uint (value, self->some_uint);
+      break;
+    case SOME_LONG_PROPERTY:
+      g_value_set_long (value, self->some_long);
+      break;
+    case SOME_ULONG_PROPERTY:
+      g_value_set_ulong (value, self->some_ulong);
+      break;
+    case SOME_INT64_PROPERTY:
+      g_value_set_int64 (value, self->some_int64);
+      break;
+    case SOME_UINT64_PROPERTY:
+      g_value_set_uint64 (value, self->some_uint64);
+      break;
+    case SOME_FLOAT_PROPERTY:
+      g_value_set_float (value, self->some_float);
+      break;
+    case SOME_DOUBLE_PROPERTY:
+      g_value_set_double (value, self->some_double);
+      break;
+    case SOME_STRV_PROPERTY:
+      g_value_set_boxed (value, self->some_strv);
+      break;
+    case SOME_BOXED_STRUCT_PROPERTY:
+      g_value_set_boxed (value, self->some_boxed_struct);
+      break;
+    case SOME_BOXED_GLIST_PROPERTY:
+      g_value_set_boxed (value, self->some_boxed_glist);
+      break;
+    case SOME_VARIANT_PROPERTY:
+      g_value_set_variant (value, self->some_variant);
+      break;
+    case SOME_OBJECT_PROPERTY:
+      g_value_set_object (value, self->some_object);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
     }
 }
 
 static void
-gi_marshalling_tests_properties_object_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec)
-{
-    GIMarshallingTestsPropertiesObject * self;
-    self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object);
-    switch (property_id) {
-        case SOME_BOOLEAN_PROPERTY:
-            self->some_boolean = g_value_get_boolean (value);
-            break;
-        case SOME_CHAR_PROPERTY:
-            self->some_char = g_value_get_schar (value);
-            break;
-        case SOME_UCHAR_PROPERTY:
-            self->some_uchar = g_value_get_uchar (value);
-            break;
-        case SOME_INT_PROPERTY:
-            self->some_int = g_value_get_int (value);
-            break;
-        case SOME_UINT_PROPERTY:
-            self->some_uint = g_value_get_uint (value);
-            break;
-        case SOME_LONG_PROPERTY:
-            self->some_long = g_value_get_long (value);
-            break;
-        case SOME_ULONG_PROPERTY:
-            self->some_ulong = g_value_get_ulong (value);
-            break;
-        case SOME_INT64_PROPERTY:
-            self->some_int64 = g_value_get_int64 (value);
-            break;
-        case SOME_UINT64_PROPERTY:
-            self->some_uint64 = g_value_get_uint64 (value);
-            break;
-        case SOME_FLOAT_PROPERTY:
-            self->some_float = g_value_get_float (value);
-            break;
-        case SOME_DOUBLE_PROPERTY:
-            self->some_double = g_value_get_double (value);
-            break;
-        case SOME_STRV_PROPERTY:
-            g_strfreev (self->some_strv);
-            self->some_strv = g_strdupv (g_value_get_boxed (value));
-            break;
-        case SOME_BOXED_STRUCT_PROPERTY:
-            gi_marshalling_tests_boxed_struct_free (self->some_boxed_struct);
-            self->some_boxed_struct = gi_marshalling_tests_boxed_struct_copy (g_value_get_boxed (value));
-            break;
-        case SOME_BOXED_GLIST_PROPERTY:
-            g_list_free (self->some_boxed_glist);
-            self->some_boxed_glist = g_list_copy (g_value_get_boxed (value));
-            break;
-        case SOME_VARIANT_PROPERTY:
-            if (self->some_variant != NULL)
-                g_variant_unref (self->some_variant);
-            self->some_variant = g_value_get_variant (value);
-            if (self->some_variant != NULL)
-                g_variant_ref (self->some_variant);
-            break;
-        case SOME_OBJECT_PROPERTY:
-            if (self->some_object != NULL)
-                g_object_unref (self->some_object);
-            self->some_object = g_value_dup_object (value);
-            break;
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-            break;
+gi_marshalling_tests_properties_object_set_property (GObject *object,
+                                                     guint property_id, const GValue *value, GParamSpec *pspec)
+{
+  GIMarshallingTestsPropertiesObject *self;
+  self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object);
+  switch (property_id)
+    {
+    case SOME_BOOLEAN_PROPERTY:
+      self->some_boolean = g_value_get_boolean (value);
+      break;
+    case SOME_CHAR_PROPERTY:
+      self->some_char = g_value_get_schar (value);
+      break;
+    case SOME_UCHAR_PROPERTY:
+      self->some_uchar = g_value_get_uchar (value);
+      break;
+    case SOME_INT_PROPERTY:
+      self->some_int = g_value_get_int (value);
+      break;
+    case SOME_UINT_PROPERTY:
+      self->some_uint = g_value_get_uint (value);
+      break;
+    case SOME_LONG_PROPERTY:
+      self->some_long = g_value_get_long (value);
+      break;
+    case SOME_ULONG_PROPERTY:
+      self->some_ulong = g_value_get_ulong (value);
+      break;
+    case SOME_INT64_PROPERTY:
+      self->some_int64 = g_value_get_int64 (value);
+      break;
+    case SOME_UINT64_PROPERTY:
+      self->some_uint64 = g_value_get_uint64 (value);
+      break;
+    case SOME_FLOAT_PROPERTY:
+      self->some_float = g_value_get_float (value);
+      break;
+    case SOME_DOUBLE_PROPERTY:
+      self->some_double = g_value_get_double (value);
+      break;
+    case SOME_STRV_PROPERTY:
+      g_strfreev (self->some_strv);
+      self->some_strv = g_strdupv (g_value_get_boxed (value));
+      break;
+    case SOME_BOXED_STRUCT_PROPERTY:
+      gi_marshalling_tests_boxed_struct_free (self->some_boxed_struct);
+      self->some_boxed_struct = gi_marshalling_tests_boxed_struct_copy (g_value_get_boxed (value));
+      break;
+    case SOME_BOXED_GLIST_PROPERTY:
+      g_list_free (self->some_boxed_glist);
+      self->some_boxed_glist = g_list_copy (g_value_get_boxed (value));
+      break;
+    case SOME_VARIANT_PROPERTY:
+      if (self->some_variant != NULL)
+        g_variant_unref (self->some_variant);
+      self->some_variant = g_value_get_variant (value);
+      if (self->some_variant != NULL)
+        g_variant_ref (self->some_variant);
+      break;
+    case SOME_OBJECT_PROPERTY:
+      if (self->some_object != NULL)
+        g_object_unref (self->some_object);
+      self->some_object = g_value_dup_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+      break;
     }
 }
 
-static void
-gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesObjectClass * klass)
-{
-    GObjectClass* object_class = G_OBJECT_CLASS (klass);
-
-    object_class->finalize = gi_marshalling_tests_properties_object_finalize;
-    object_class->get_property = gi_marshalling_tests_properties_object_get_property;
-    object_class->set_property = gi_marshalling_tests_properties_object_set_property;
-
-    g_object_class_install_property (object_class, SOME_BOOLEAN_PROPERTY,
-        g_param_spec_boolean ("some-boolean", "some-boolean", "some-boolean", FALSE,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_CHAR_PROPERTY,
-        g_param_spec_char ("some-char", "some-char", "some-char", G_MININT8, G_MAXINT8, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_UCHAR_PROPERTY,
-        g_param_spec_uchar ("some-uchar", "some-uchar", "some-uchar", 0, G_MAXUINT8, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_INT_PROPERTY,
-        g_param_spec_int ("some-int", "some-int", "some-int", G_MININT, G_MAXINT, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_UINT_PROPERTY,
-        g_param_spec_uint ("some-uint", "some-uint", "some-uint", 0, G_MAXUINT, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_LONG_PROPERTY,
-        g_param_spec_long ("some-long", "some-long", "some-long", G_MINLONG, G_MAXLONG, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_ULONG_PROPERTY,
-        g_param_spec_ulong ("some-ulong", "some-ulong", "some-ulong", 0, G_MAXULONG, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_INT64_PROPERTY,
-        g_param_spec_int64 ("some-int64", "some-int64", "some-int64", G_MININT64, G_MAXINT64, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_UINT64_PROPERTY,
-        g_param_spec_uint64 ("some-uint64", "some-uint64", "some-uint64", 0, G_MAXUINT64, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_FLOAT_PROPERTY,
-        g_param_spec_float ("some-float", "some-float", "some-float", -1 * G_MAXFLOAT, G_MAXFLOAT, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_DOUBLE_PROPERTY,
-        g_param_spec_double ("some-double", "some-double", "some-double", -1 * G_MAXDOUBLE, G_MAXDOUBLE, 0,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_STRV_PROPERTY,
-        g_param_spec_boxed ("some-strv", "some-strv", "some-strv", G_TYPE_STRV,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_BOXED_STRUCT_PROPERTY,
-        g_param_spec_boxed ("some-boxed-struct", "some-boxed-struct", "some-boxed-struct", 
-            gi_marshalling_tests_boxed_struct_get_type(),
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+static void gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesObjectClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = gi_marshalling_tests_properties_object_finalize;
+  object_class->get_property = gi_marshalling_tests_properties_object_get_property;
+  object_class->set_property = gi_marshalling_tests_properties_object_set_property;
+
+  g_object_class_install_property (object_class, SOME_BOOLEAN_PROPERTY,
+                                   g_param_spec_boolean ("some-boolean",
+                                                         "some-boolean",
+                                                         "some-boolean",
+                                                         FALSE,
+                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_CHAR_PROPERTY,
+                                   g_param_spec_char ("some-char",
+                                                      "some-char",
+                                                      "some-char", G_MININT8,
+                                                      G_MAXINT8, 0,
+                                                      G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_UCHAR_PROPERTY,
+                                   g_param_spec_uchar ("some-uchar",
+                                                       "some-uchar",
+                                                       "some-uchar", 0,
+                                                       G_MAXUINT8, 0,
+                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_INT_PROPERTY,
+                                   g_param_spec_int ("some-int", "some-int",
+                                                     "some-int", G_MININT,
+                                                     G_MAXINT, 0,
+                                                     G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_UINT_PROPERTY,
+                                   g_param_spec_uint ("some-uint",
+                                                      "some-uint",
+                                                      "some-uint", 0,
+                                                      G_MAXUINT, 0,
+                                                      G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_LONG_PROPERTY,
+                                   g_param_spec_long ("some-long",
+                                                      "some-long",
+                                                      "some-long", G_MINLONG,
+                                                      G_MAXLONG, 0,
+                                                      G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_ULONG_PROPERTY,
+                                   g_param_spec_ulong ("some-ulong",
+                                                       "some-ulong",
+                                                       "some-ulong", 0,
+                                                       G_MAXULONG, 0,
+                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_INT64_PROPERTY,
+                                   g_param_spec_int64 ("some-int64",
+                                                       "some-int64",
+                                                       "some-int64",
+                                                       G_MININT64, G_MAXINT64,
+                                                       0, G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_UINT64_PROPERTY,
+                                   g_param_spec_uint64 ("some-uint64",
+                                                        "some-uint64",
+                                                        "some-uint64", 0,
+                                                        G_MAXUINT64, 0,
+                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_FLOAT_PROPERTY,
+                                   g_param_spec_float ("some-float",
+                                                       "some-float",
+                                                       "some-float",
+                                                       -1 * G_MAXFLOAT,
+                                                       G_MAXFLOAT, 0,
+                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_DOUBLE_PROPERTY,
+                                   g_param_spec_double ("some-double",
+                                                        "some-double",
+                                                        "some-double",
+                                                        -1 * G_MAXDOUBLE,
+                                                        G_MAXDOUBLE, 0,
+                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_STRV_PROPERTY,
+                                   g_param_spec_boxed ("some-strv",
+                                                       "some-strv",
+                                                       "some-strv",
+                                                       G_TYPE_STRV,
+                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_BOXED_STRUCT_PROPERTY,
+                                   g_param_spec_boxed ("some-boxed-struct",
+                                                       "some-boxed-struct",
+                                                       "some-boxed-struct",
+                                                       gi_marshalling_tests_boxed_struct_get_type
+                                                       (), G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
 
     /**
      * GIMarshallingTestsPropertiesObject:some-boxed-glist:
@@ -5101,23 +5188,31 @@ gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesO
      * Type: GLib.List(gint)
      * Transfer: none
      */
-    g_object_class_install_property (object_class, SOME_BOXED_GLIST_PROPERTY,
-        g_param_spec_boxed ("some-boxed-glist", "some-boxed-glist", "some-boxed-glist", 
-            gi_marshalling_tests_boxed_glist_get_type(),
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_VARIANT_PROPERTY,
-        g_param_spec_variant ("some-variant", "some-variant", "some-variant", 
-            G_VARIANT_TYPE_ANY, NULL,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-
-    g_object_class_install_property (object_class, SOME_OBJECT_PROPERTY,
-        g_param_spec_object ("some-object", "some-object", "some-object", G_TYPE_OBJECT,
-            G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
-}
-
-GIMarshallingTestsPropertiesObject*
+  g_object_class_install_property (object_class, SOME_BOXED_GLIST_PROPERTY,
+                                   g_param_spec_boxed ("some-boxed-glist",
+                                                       "some-boxed-glist",
+                                                       "some-boxed-glist",
+                                                       gi_marshalling_tests_boxed_glist_get_type
+                                                       (), G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_VARIANT_PROPERTY,
+                                   g_param_spec_variant ("some-variant",
+                                                         "some-variant",
+                                                         "some-variant",
+                                                         G_VARIANT_TYPE_ANY,
+                                                         NULL,
+                                                         G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_OBJECT_PROPERTY,
+                                   g_param_spec_object ("some-object",
+                                                        "some-object",
+                                                        "some-object",
+                                                        G_TYPE_OBJECT,
+                                                        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+}
+
+GIMarshallingTestsPropertiesObject *
 gi_marshalling_tests_properties_object_new (void)
 {
-    return g_object_new (GI_MARSHALLING_TESTS_TYPE_PROPERTIES_OBJECT, NULL);
+  return g_object_new (GI_MARSHALLING_TESTS_TYPE_PROPERTIES_OBJECT, NULL);
 }
diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c
index e078699a..565c95c3 100644
--- a/tests/repository/gitypelibtest.c
+++ b/tests/repository/gitypelibtest.c
@@ -1,5 +1,5 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- * vim: tabstop=4 shiftwidth=4 expandtab
+/* -*- Mode: C; c-basic-offset: 2 -*-
+ * vim: shiftwidth=2 expandtab
  */
 
 #include "girepository.h"
@@ -9,287 +9,289 @@
 #include <unistd.h>
 
 static void
-test_enum_and_flags_cidentifier(GIRepository *repo)
+test_enum_and_flags_cidentifier (GIRepository * repo)
 {
-    GITypelib *ret;
-    GError *error = NULL;
-    gint n_infos, i;
+  GITypelib *ret;
+  GError *error = NULL;
+  gint n_infos, i;
 
-    ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
-    if (!ret)
-        g_error ("%s", error->message);
+  ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
 
-    n_infos = g_irepository_get_n_infos (repo, "GIMarshallingTests");
+  n_infos = g_irepository_get_n_infos (repo, "GIMarshallingTests");
 
-    for (i = 0; i < n_infos; i++) {
-        GIBaseInfo *info;
+  for (i = 0; i < n_infos; i++)
+    {
+      GIBaseInfo *info;
 
-        info = g_irepository_get_info (repo, "GIMarshallingTests", i);
+      info = g_irepository_get_info (repo, "GIMarshallingTests", i);
 
-        /* both GI_INFO_TYPE_ENUM and GI_INFO_TYPE_FLAGS use GIEnumInfo */
-        if (GI_IS_ENUM_INFO (info)) {
-            gint n_values, j;
+      /* both GI_INFO_TYPE_ENUM and GI_INFO_TYPE_FLAGS use GIEnumInfo */
+      if (GI_IS_ENUM_INFO (info))
+        {
+          gint n_values, j;
 
-            n_values = g_enum_info_get_n_values ((GIEnumInfo *) info);
-            for (j = 0; j < n_values; j++) {
-                GIValueInfo *value_info;
-                const gchar *c_identifier = NULL;
+          n_values = g_enum_info_get_n_values ((GIEnumInfo *) info);
+          for (j = 0; j < n_values; j++)
+            {
+              GIValueInfo *value_info;
+              const gchar *c_identifier = NULL;
 
-                value_info = g_enum_info_get_value ((GIEnumInfo *) info, j);
-                c_identifier = g_base_info_get_attribute ((GIBaseInfo *) value_info, "c:identifier");
+              value_info = g_enum_info_get_value ((GIEnumInfo *) info, j);
+              c_identifier = g_base_info_get_attribute ((GIBaseInfo *) value_info, "c:identifier");
 
-                if (c_identifier == NULL) {
-                    g_error ("Error: no 'c:identifier' attribute on GIMarshallingTests.%s.%s\n",
-                             g_base_info_get_name (info),
-                             g_base_info_get_name ((GIBaseInfo *) value_info));
+              if (c_identifier == NULL)
+                {
+                  g_error
+                    ("Error: no 'c:identifier' attribute on GIMarshallingTests.%s.%s\n",
+                     g_base_info_get_name (info), g_base_info_get_name ((GIBaseInfo *) value_info));
                 }
 
-                g_base_info_unref ((GIBaseInfo *) value_info);
+              g_base_info_unref ((GIBaseInfo *) value_info);
             }
         }
 
-        g_base_info_unref (info);
+      g_base_info_unref (info);
     }
 }
 
 static void
-_check_enum_methods (GIBaseInfo *info, const gchar *name, const gchar *prefix)
+_check_enum_methods (GIBaseInfo * info, const gchar * name, const gchar * prefix)
 {
-    gint n_methods, i;
-
-    n_methods = g_enum_info_get_n_methods ((GIEnumInfo *) info);
-    if (n_methods <= 0)
-        g_error ("%s should have methods", name);
-
-    for (i = 0; i < n_methods; i += n_methods-1) {
-        GIBaseInfo *function_info;
-        GIFunctionInfoFlags flags;
-        const gchar *symbol;
-        function_info = g_enum_info_get_method ((GIEnumInfo *) info, i);
-        if (!function_info)
-            g_error ("Could not find %s method nr. %d", name, i+1);
-        flags = g_function_info_get_flags ((GIFunctionInfo *) function_info);
-        if (flags != 0)
-            g_error ("%s methods should be static", name);
-        symbol = g_function_info_get_symbol ((GIFunctionInfo *) function_info);
-        if (!symbol || !g_str_has_prefix (symbol, prefix))
-            g_error ("Could not find valid function symbol");
-        g_base_info_unref (function_info);
+  gint n_methods, i;
+
+  n_methods = g_enum_info_get_n_methods ((GIEnumInfo *) info);
+  if (n_methods <= 0)
+    g_error ("%s should have methods", name);
+
+  for (i = 0; i < n_methods; i += n_methods - 1)
+    {
+      GIBaseInfo *function_info;
+      GIFunctionInfoFlags flags;
+      const gchar *symbol;
+      function_info = g_enum_info_get_method ((GIEnumInfo *) info, i);
+      if (!function_info)
+        g_error ("Could not find %s method nr. %d", name, i + 1);
+      flags = g_function_info_get_flags ((GIFunctionInfo *) function_info);
+      if (flags != 0)
+        g_error ("%s methods should be static", name);
+      symbol = g_function_info_get_symbol ((GIFunctionInfo *) function_info);
+      if (!symbol || !g_str_has_prefix (symbol, prefix))
+        g_error ("Could not find valid function symbol");
+      g_base_info_unref (function_info);
     }
 }
 
 static void
-test_enum_and_flags_static_methods(GIRepository *repo)
+test_enum_and_flags_static_methods (GIRepository * repo)
 {
-    GITypelib *ret;
-    GError *error = NULL;
-    GIBaseInfo *enum_info;
-
-    ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
-    if (!ret)
-        g_error ("%s", error->message);
-
-    enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "GEnum");
-    if (!enum_info)
-        g_error ("Could not find GIMarshallingTests.GEnum");
-    _check_enum_methods (enum_info,
-                         "GIMarshallingTests.GEnum",
-                         "gi_marshalling_tests_genum_");
-    g_base_info_unref (enum_info);
-
-    enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "Flags");
-    if (!enum_info)
-        g_error ("Could not find GIMarshallingTests.Flags");
-    _check_enum_methods (enum_info,
-                         "GIMarshallingTests.Flags",
-                         "gi_marshalling_tests_flags_");
-    g_base_info_unref (enum_info);
+  GITypelib *ret;
+  GError *error = NULL;
+  GIBaseInfo *enum_info;
+
+  ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
+
+  enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "GEnum");
+  if (!enum_info)
+    g_error ("Could not find GIMarshallingTests.GEnum");
+  _check_enum_methods (enum_info, "GIMarshallingTests.GEnum", "gi_marshalling_tests_genum_");
+  g_base_info_unref (enum_info);
+
+  enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "Flags");
+  if (!enum_info)
+    g_error ("Could not find GIMarshallingTests.Flags");
+  _check_enum_methods (enum_info, "GIMarshallingTests.Flags", "gi_marshalling_tests_flags_");
+  g_base_info_unref (enum_info);
 }
 
 static void
-test_size_of_gvalue(GIRepository *repo)
+test_size_of_gvalue (GIRepository * repo)
 {
-    GIBaseInfo *struct_info;
+  GIBaseInfo *struct_info;
 
-    struct_info = g_irepository_find_by_name (repo, "GObject", "Value");
-    if (!struct_info)
-        g_error ("Could not find GObject.Value");
-    g_assert_cmpuint (g_struct_info_get_size (struct_info), ==, sizeof (GValue));
-    g_base_info_unref (struct_info);
+  struct_info = g_irepository_find_by_name (repo, "GObject", "Value");
+  if (!struct_info)
+    g_error ("Could not find GObject.Value");
+  g_assert_cmpuint (g_struct_info_get_size (struct_info), ==, sizeof (GValue));
+  g_base_info_unref (struct_info);
 }
 
 static void
-test_is_pointer_for_struct_arg (GIRepository *repo)
+test_is_pointer_for_struct_arg (GIRepository * repo)
 {
-    GITypelib *ret;
-    GError *error = NULL;
-    GIStructInfo *variant_info;
-    GIFunctionInfo *equal_info;
-    GIArgInfo *arg_info;
-    GITypeInfo *type_info;
-
-    ret = g_irepository_require (repo, "GLib", NULL, 0, &error);
-    if (!ret)
-        g_error ("%s", error->message);
-
-    variant_info = g_irepository_find_by_name (repo, "GLib", "Variant");
-    if (!variant_info)
-	g_error ("Could not find GLib.Variant");
-
-    equal_info = g_struct_info_find_method (variant_info, "equal");
-    if (!equal_info)
-	g_error ("Could not find GLib.Variant.equal()");
-
-    arg_info = g_callable_info_get_arg (equal_info, 0);
-    if (!arg_info)
-	g_error ("Could not find 1st arg of GLib.Variant.equal()");
-
-    type_info = g_arg_info_get_type (arg_info);
-    if (!type_info)
-	g_error ("Could not find typeinfo of 1st arg of GLib.Variant.equal()");
-
-    g_assert (g_type_info_is_pointer (type_info));
-
-    g_base_info_unref (type_info);
-    g_base_info_unref (arg_info);
-    g_base_info_unref (equal_info);
-    g_base_info_unref (variant_info);
+  GITypelib *ret;
+  GError *error = NULL;
+  GIStructInfo *variant_info;
+  GIFunctionInfo *equal_info;
+  GIArgInfo *arg_info;
+  GITypeInfo *type_info;
+
+  ret = g_irepository_require (repo, "GLib", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
+
+  variant_info = g_irepository_find_by_name (repo, "GLib", "Variant");
+  if (!variant_info)
+    g_error ("Could not find GLib.Variant");
+
+  equal_info = g_struct_info_find_method (variant_info, "equal");
+  if (!equal_info)
+    g_error ("Could not find GLib.Variant.equal()");
+
+  arg_info = g_callable_info_get_arg (equal_info, 0);
+  if (!arg_info)
+    g_error ("Could not find 1st arg of GLib.Variant.equal()");
+
+  type_info = g_arg_info_get_type (arg_info);
+  if (!type_info)
+    g_error ("Could not find typeinfo of 1st arg of GLib.Variant.equal()");
+
+  g_assert (g_type_info_is_pointer (type_info));
+
+  g_base_info_unref (type_info);
+  g_base_info_unref (arg_info);
+  g_base_info_unref (equal_info);
+  g_base_info_unref (variant_info);
 }
 
 static void
-test_fundamental_get_ref_function_pointer (GIRepository *repo)
+test_fundamental_get_ref_function_pointer (GIRepository * repo)
 {
-    GIObjectInfo *info;
+  GIObjectInfo *info;
 
-    g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
-    info = g_irepository_find_by_name (repo, "Regress",
-                                       "TestFundamentalObject");
-    g_object_info_get_ref_function_pointer (info);
-    g_base_info_unref (info);
+  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
+  info = g_irepository_find_by_name (repo, "Regress", "TestFundamentalObject");
+  g_object_info_get_ref_function_pointer (info);
+  g_base_info_unref (info);
 }
 
 static void
-test_hash_with_cairo_typelib (GIRepository *repo)
+test_hash_with_cairo_typelib (GIRepository * repo)
 {
-    GIBaseInfo *info;
+  GIBaseInfo *info;
 
-    g_assert (g_irepository_require (repo, "cairo", NULL, 0, NULL));
-    info = g_irepository_find_by_name (repo, "cairo", "region");
-    g_assert (info == NULL);
+  g_assert (g_irepository_require (repo, "cairo", NULL, 0, NULL));
+  info = g_irepository_find_by_name (repo, "cairo", "region");
+  g_assert (info == NULL);
 }
 
 static GIPropertyInfo *
-lookup_property (GIObjectInfo *info, const gchar *name)
+lookup_property (GIObjectInfo * info, const gchar * name)
 {
-    gssize n_props;
-    gssize i;
-    GIPropertyInfo *property_info;
-
-    n_props = g_object_info_get_n_properties (info);
-    for (i = 0; i < n_props; i++) {
-        property_info = g_object_info_get_property (info, i);
-        if (strcmp (name, g_base_info_get_name (property_info)) == 0)
-            return property_info;
-        g_base_info_unref (property_info);
+  gssize n_props;
+  gssize i;
+  GIPropertyInfo *property_info;
+
+  n_props = g_object_info_get_n_properties (info);
+  for (i = 0; i < n_props; i++)
+    {
+      property_info = g_object_info_get_property (info, i);
+      if (strcmp (name, g_base_info_get_name (property_info)) == 0)
+        return property_info;
+      g_base_info_unref (property_info);
     }
 
-    return NULL;
+  return NULL;
 }
 
 static void
-test_char_types (GIRepository *repo)
+test_char_types (GIRepository * repo)
 {
-    GITypelib *ret;
-    GError *error = NULL;
-    GIBaseInfo *prop_obj;
-    GIPropertyInfo *prop_info;
-    GITypeInfo *type_info;
-
-    ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
-    if (!ret)
-        g_error ("%s", error->message);
-
-    prop_obj = g_irepository_find_by_name (repo, "GIMarshallingTests", "PropertiesObject");
-    g_assert (prop_obj != NULL);
-    g_assert (GI_IS_OBJECT_INFO (prop_obj));
-
-    /* unsigned char */
-    prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-uchar");
-    g_assert (prop_info != NULL);
-    type_info = g_property_info_get_type (prop_info);
-    g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UINT8);
-    g_base_info_unref (type_info);
-    g_base_info_unref (prop_info);
-
-    /* signed char */
-    prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-char");
-    g_assert (prop_info != NULL);
-    type_info = g_property_info_get_type (prop_info);
-    g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_INT8);
-    g_base_info_unref (type_info);
-    g_base_info_unref (prop_info);
-
-    g_base_info_unref (prop_obj);
+  GITypelib *ret;
+  GError *error = NULL;
+  GIBaseInfo *prop_obj;
+  GIPropertyInfo *prop_info;
+  GITypeInfo *type_info;
+
+  ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error);
+  if (!ret)
+    g_error ("%s", error->message);
+
+  prop_obj = g_irepository_find_by_name (repo, "GIMarshallingTests", "PropertiesObject");
+  g_assert (prop_obj != NULL);
+  g_assert (GI_IS_OBJECT_INFO (prop_obj));
+
+  /* unsigned char */
+  prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-uchar");
+  g_assert (prop_info != NULL);
+  type_info = g_property_info_get_type (prop_info);
+  g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UINT8);
+  g_base_info_unref (type_info);
+  g_base_info_unref (prop_info);
+
+  /* signed char */
+  prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-char");
+  g_assert (prop_info != NULL);
+  type_info = g_property_info_get_type (prop_info);
+  g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_INT8);
+  g_base_info_unref (type_info);
+  g_base_info_unref (prop_info);
+
+  g_base_info_unref (prop_obj);
 }
 
 static void
-test_signal_array_len (GIRepository *repo)
+test_signal_array_len (GIRepository * repo)
 {
-    GIObjectInfo *testobj_info;
-    GISignalInfo *sig_info;
-    GIArgInfo arg_info;
-    GITypeInfo type_info;
-    int i;
-
-    g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
-    testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
-    g_assert (testobj_info != NULL);
-
-    /* find sig-with-array-len-prop signal */
-    for (i = g_object_info_get_n_signals (testobj_info) - 1; i >= 0; --i) {
-        sig_info = g_object_info_get_signal (testobj_info, i);
-        g_assert (sig_info != NULL);
-        if (strcmp (g_base_info_get_name (sig_info), "sig-with-array-len-prop") == 0)
-            break;
-        g_base_info_unref (sig_info);
+  GIObjectInfo *testobj_info;
+  GISignalInfo *sig_info;
+  GIArgInfo arg_info;
+  GITypeInfo type_info;
+  int i;
+
+  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
+  testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
+  g_assert (testobj_info != NULL);
+
+  /* find sig-with-array-len-prop signal */
+  for (i = g_object_info_get_n_signals (testobj_info) - 1; i >= 0; --i)
+    {
+      sig_info = g_object_info_get_signal (testobj_info, i);
+      g_assert (sig_info != NULL);
+      if (strcmp (g_base_info_get_name (sig_info), "sig-with-array-len-prop") == 0)
+        break;
+      g_base_info_unref (sig_info);
     }
-    g_assert (i >= 0);
+  g_assert (i >= 0);
 
-    g_assert_cmpint (g_callable_info_get_n_args (sig_info), ==, 2);
+  g_assert_cmpint (g_callable_info_get_n_args (sig_info), ==, 2);
 
-    /* verify array argument */
-    g_callable_info_load_arg (sig_info, 0, &arg_info);
-    g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "arr");
-    g_arg_info_load_type (&arg_info, &type_info);
-    g_assert_cmpint (g_type_info_get_tag (&type_info), ==, GI_TYPE_TAG_ARRAY);
-    g_assert_cmpint (g_type_info_get_array_type (&type_info), ==, GI_ARRAY_TYPE_C);
-    g_assert (!g_type_info_is_zero_terminated (&type_info));
-    g_assert_cmpint (g_type_info_get_array_length (&type_info), ==, 1);
+  /* verify array argument */
+  g_callable_info_load_arg (sig_info, 0, &arg_info);
+  g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "arr");
+  g_arg_info_load_type (&arg_info, &type_info);
+  g_assert_cmpint (g_type_info_get_tag (&type_info), ==, GI_TYPE_TAG_ARRAY);
+  g_assert_cmpint (g_type_info_get_array_type (&type_info), ==, GI_ARRAY_TYPE_C);
+  g_assert (!g_type_info_is_zero_terminated (&type_info));
+  g_assert_cmpint (g_type_info_get_array_length (&type_info), ==, 1);
 
-    /* verify array length argument */
-    g_callable_info_load_arg (sig_info, 1, &arg_info);
-    g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "len");
+  /* verify array length argument */
+  g_callable_info_load_arg (sig_info, 1, &arg_info);
+  g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "len");
 
-    g_base_info_unref (sig_info);
-    g_base_info_unref (testobj_info);
+  g_base_info_unref (sig_info);
+  g_base_info_unref (testobj_info);
 }
 
 int
-main(int argc, char **argv)
+main (int argc, char **argv)
 {
-    GIRepository *repo;
+  GIRepository *repo;
 
-    repo = g_irepository_get_default ();
+  repo = g_irepository_get_default ();
 
-    /* do tests */
-    test_enum_and_flags_cidentifier (repo);
-    test_enum_and_flags_static_methods (repo);
-    test_size_of_gvalue (repo);
-    test_is_pointer_for_struct_arg (repo);
-    test_fundamental_get_ref_function_pointer (repo);
-    test_hash_with_cairo_typelib (repo);
-    test_char_types (repo);
-    test_signal_array_len (repo);
+  /* do tests */
+  test_enum_and_flags_cidentifier (repo);
+  test_enum_and_flags_static_methods (repo);
+  test_size_of_gvalue (repo);
+  test_is_pointer_for_struct_arg (repo);
+  test_fundamental_get_ref_function_pointer (repo);
+  test_hash_with_cairo_typelib (repo);
+  test_char_types (repo);
+  test_signal_array_len (repo);
 
-    exit(0);
+  exit (0);
 }
diff --git a/tests/scanner/gettype.c b/tests/scanner/gettype.c
index cd816735..a3c2d6be 100644
--- a/tests/scanner/gettype.c
+++ b/tests/scanner/gettype.c
@@ -1,14 +1,14 @@
 #include "gettype.h"
 
-G_DEFINE_TYPE(GetTypeObject, gettype_object, G_TYPE_OBJECT);
+G_DEFINE_TYPE (GetTypeObject, gettype_object, G_TYPE_OBJECT);
 
 static void
-gettype_object_class_init (GetTypeObjectClass *klass)
+gettype_object_class_init (GetTypeObjectClass * klass)
 {
 }
 
 static void
-gettype_object_init (GetTypeObject *object)
+gettype_object_init (GetTypeObject * object)
 {
 }
 
@@ -28,9 +28,9 @@ gettype_object_new (void)
  * Returns: 0
  */
 GType
-gettype_object_nonmeta1_get_type (GetTypeObject *obj)
+gettype_object_nonmeta1_get_type (GetTypeObject * obj)
 {
-    return 0;
+  return 0;
 }
 
 /**
@@ -44,7 +44,7 @@ gettype_object_nonmeta1_get_type (GetTypeObject *obj)
 gboolean
 gettype_object_nonmeta2_get_type (void)
 {
-    return TRUE;
+  return TRUE;
 }
 
 /**
@@ -58,5 +58,5 @@ gettype_object_nonmeta2_get_type (void)
 gboolean
 gettype_object_nonmeta_get_gtype (void)
 {
-    return TRUE;
+  return TRUE;
 }