diff --git a/.gitignore b/.gitignore
index 1cea4d6..dea202a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,3 +105,4 @@
 /gobject-introspection-1.75.6.tar.xz
 /gobject-introspection-1.76.0.tar.xz
 /gobject-introspection-1.76.1.tar.xz
+/gobject-introspection-1.78.1.tar.xz
diff --git a/gobject-introspection-1.76.1-revert-failing-test.patch b/gobject-introspection-1.76.1-revert-failing-test.patch
deleted file mode 100644
index 14cd220..0000000
--- a/gobject-introspection-1.76.1-revert-failing-test.patch
+++ /dev/null
@@ -1,2172 +0,0 @@
-From: Jeremy Bicha <jeremy.bicha@canonical.com>
-Date: Wed, 15 Mar 2023 16:06:30 -0400
-Subject: Revert "tests/scanner: add some tests for #defines"
-
-This reverts commit 41feafa85d73b4a9dd8eac9dbe1231130bf2c7ca
-
-See https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/458
----
- .../Regress.BAD_EXPR_CONSTANT.page                 |  14 -
- .../Regress.GOOD_EXPR_CONSTANT.page                |  14 -
- .../Regress.BAD_EXPR_CONSTANT.page                 |  14 -
- .../Regress.GOOD_EXPR_CONSTANT.page                |  14 -
- .../Regress.BAD_EXPR_CONSTANT.page                 |  14 -
- .../Regress.GOOD_EXPR_CONSTANT.page                |  14 -
- tests/scanner/Regress-1.0-expected.gir             | 492 ++++++++++-----------
- tests/scanner/regress.h                            |   2 -
- 8 files changed, 240 insertions(+), 338 deletions(-)
- delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.BAD_EXPR_CONSTANT.page
- delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GOOD_EXPR_CONSTANT.page
- delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.BAD_EXPR_CONSTANT.page
- delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GOOD_EXPR_CONSTANT.page
- delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.BAD_EXPR_CONSTANT.page
- delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GOOD_EXPR_CONSTANT.page
-
-diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.BAD_EXPR_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.BAD_EXPR_CONSTANT.page
-deleted file mode 100644
-index bc8190a..0000000
---- a/tests/scanner/Regress-1.0-C-expected/Regress.BAD_EXPR_CONSTANT.page
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0"?>
--<page id="Regress.BAD_EXPR_CONSTANT"
--      type="topic"
--      style="default"
--      xmlns="http://projectmallard.org/1.0/"
--      xmlns:api="http://projectmallard.org/experimental/api/"
--      xmlns:ui="http://projectmallard.org/1.0/ui/">
--  <info>
--    <link xref="index" group="default" type="guide"/>
--  </info>
--  <title>Regress.BAD_EXPR_CONSTANT</title>
--
--
--</page>
-diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GOOD_EXPR_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.GOOD_EXPR_CONSTANT.page
-deleted file mode 100644
-index a204cdc..0000000
---- a/tests/scanner/Regress-1.0-C-expected/Regress.GOOD_EXPR_CONSTANT.page
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0"?>
--<page id="Regress.GOOD_EXPR_CONSTANT"
--      type="topic"
--      style="default"
--      xmlns="http://projectmallard.org/1.0/"
--      xmlns:api="http://projectmallard.org/experimental/api/"
--      xmlns:ui="http://projectmallard.org/1.0/ui/">
--  <info>
--    <link xref="index" group="default" type="guide"/>
--  </info>
--  <title>Regress.GOOD_EXPR_CONSTANT</title>
--
--
--</page>
-diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.BAD_EXPR_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.BAD_EXPR_CONSTANT.page
-deleted file mode 100644
-index bc8190a..0000000
---- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.BAD_EXPR_CONSTANT.page
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0"?>
--<page id="Regress.BAD_EXPR_CONSTANT"
--      type="topic"
--      style="default"
--      xmlns="http://projectmallard.org/1.0/"
--      xmlns:api="http://projectmallard.org/experimental/api/"
--      xmlns:ui="http://projectmallard.org/1.0/ui/">
--  <info>
--    <link xref="index" group="default" type="guide"/>
--  </info>
--  <title>Regress.BAD_EXPR_CONSTANT</title>
--
--
--</page>
-diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GOOD_EXPR_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GOOD_EXPR_CONSTANT.page
-deleted file mode 100644
-index a204cdc..0000000
---- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GOOD_EXPR_CONSTANT.page
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0"?>
--<page id="Regress.GOOD_EXPR_CONSTANT"
--      type="topic"
--      style="default"
--      xmlns="http://projectmallard.org/1.0/"
--      xmlns:api="http://projectmallard.org/experimental/api/"
--      xmlns:ui="http://projectmallard.org/1.0/ui/">
--  <info>
--    <link xref="index" group="default" type="guide"/>
--  </info>
--  <title>Regress.GOOD_EXPR_CONSTANT</title>
--
--
--</page>
-diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.BAD_EXPR_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.BAD_EXPR_CONSTANT.page
-deleted file mode 100644
-index bc8190a..0000000
---- a/tests/scanner/Regress-1.0-Python-expected/Regress.BAD_EXPR_CONSTANT.page
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0"?>
--<page id="Regress.BAD_EXPR_CONSTANT"
--      type="topic"
--      style="default"
--      xmlns="http://projectmallard.org/1.0/"
--      xmlns:api="http://projectmallard.org/experimental/api/"
--      xmlns:ui="http://projectmallard.org/1.0/ui/">
--  <info>
--    <link xref="index" group="default" type="guide"/>
--  </info>
--  <title>Regress.BAD_EXPR_CONSTANT</title>
--
--
--</page>
-diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GOOD_EXPR_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GOOD_EXPR_CONSTANT.page
-deleted file mode 100644
-index a204cdc..0000000
---- a/tests/scanner/Regress-1.0-Python-expected/Regress.GOOD_EXPR_CONSTANT.page
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0"?>
--<page id="Regress.GOOD_EXPR_CONSTANT"
--      type="topic"
--      style="default"
--      xmlns="http://projectmallard.org/1.0/"
--      xmlns:api="http://projectmallard.org/experimental/api/"
--      xmlns:ui="http://projectmallard.org/1.0/ui/">
--  <info>
--    <link xref="index" group="default" type="guide"/>
--  </info>
--  <title>Regress.GOOD_EXPR_CONSTANT</title>
--
--
--</page>
-diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
-index 902513d..424e2e1 100644
---- a/tests/scanner/Regress-1.0-expected.gir
-+++ b/tests/scanner/Regress-1.0-expected.gir
-@@ -18,8 +18,8 @@ and/or use gtk-doc annotations.  -->
-     <alias name="AliasedTestBoxed" c:type="RegressAliasedTestBoxed">
-       <doc xml:space="preserve"
-            filename="regress.h"
--           line="1460">Typedef TestBoxed to test caller-allocates correctness</doc>
--      <source-position filename="regress.h" line="1465"/>
-+           line="1458">Typedef TestBoxed to test caller-allocates correctness</doc>
-+      <source-position filename="regress.h" line="1463"/>
-       <type name="TestBoxed" c:type="RegressTestBoxed"/>
-     </alias>
-     <alias name="FooObjectCookie" c:type="RegressFooObjectCookie">
-@@ -33,26 +33,26 @@ and/or use gtk-doc annotations.  -->
-     <alias name="IntsetAlias" c:type="RegressIntsetAlias" introspectable="0">
-       <doc xml:space="preserve"
-            filename="regress.h"
--           line="1430">Compatibility typedef, like telepathy-glib's TpIntSet</doc>
--      <source-position filename="regress.h" line="1436"/>
-+           line="1428">Compatibility typedef, like telepathy-glib's TpIntSet</doc>
-+      <source-position filename="regress.h" line="1434"/>
-       <type name="Intset" c:type="RegressIntset"/>
-     </alias>
-     <alias name="PtrArrayAlias" c:type="RegressPtrArrayAlias">
-       <doc xml:space="preserve"
-            filename="regress.h"
--           line="1438">Typedef'd GPtrArray for some reason</doc>
--      <source-position filename="regress.h" line="1443"/>
-+           line="1436">Typedef'd GPtrArray for some reason</doc>
-+      <source-position filename="regress.h" line="1441"/>
-       <type name="GLib.PtrArray" c:type="GPtrArray"/>
-     </alias>
-     <alias name="TestTypeGUInt64" c:type="RegressTestTypeGUInt64">
--      <source-position filename="regress.h" line="530"/>
-+      <source-position filename="regress.h" line="528"/>
-       <type name="guint64" c:type="guint64"/>
-     </alias>
-     <alias name="VaListAlias" c:type="RegressVaListAlias" introspectable="0">
-       <doc xml:space="preserve"
-            filename="regress.h"
--           line="1449">Typedef'd va_list for additional reasons</doc>
--      <source-position filename="regress.h" line="1454"/>
-+           line="1447">Typedef'd va_list for additional reasons</doc>
-+      <source-position filename="regress.h" line="1452"/>
-       <type name="va_list" c:type="va_list"/>
-     </alias>
-     <constant name="ANNOTATION_CALCULATED_DEFINE"
-@@ -92,12 +92,12 @@ and/or use gtk-doc annotations.  -->
-       </member>
-     </enumeration>
-     <record name="AnAnonymousUnion" c:type="RegressAnAnonymousUnion">
--      <source-position filename="regress.h" line="1566"/>
-+      <source-position filename="regress.h" line="1564"/>
-       <field name="x" writable="1">
-         <type name="gint" c:type="int"/>
-       </field>
-       <union>
--        <source-position filename="regress.h" line="1565"/>
-+        <source-position filename="regress.h" line="1563"/>
-         <field name="a" writable="1">
-           <array zero-terminated="0" fixed-size="2">
-             <type name="LikeGnomeKeyringPasswordSchema"
-@@ -1227,14 +1227,14 @@ it says it's pointer but it's actually a string.</doc>
-     </record>
-     <record name="AnonymousUnionAndStruct"
-             c:type="RegressAnonymousUnionAndStruct">
--      <source-position filename="regress.h" line="1579"/>
-+      <source-position filename="regress.h" line="1577"/>
-       <field name="x" writable="1">
-         <type name="gint" c:type="int"/>
-       </field>
-       <union>
--        <source-position filename="regress.h" line="1578"/>
-+        <source-position filename="regress.h" line="1576"/>
-         <record>
--          <source-position filename="regress.h" line="1575"/>
-+          <source-position filename="regress.h" line="1573"/>
-           <field name="a" writable="1">
-             <type name="LikeGnomeKeyringPasswordSchema"
-                   c:type="RegressLikeGnomeKeyringPasswordSchema*"/>
-@@ -1250,12 +1250,6 @@ it says it's pointer but it's actually a string.</doc>
-         </field>
-       </union>
-     </record>
--    <constant name="BAD_EXPR_CONSTANT"
--              value="1"
--              c:type="REGRESS_BAD_EXPR_CONSTANT">
--      <source-position filename="regress.h" line="528"/>
--      <type name="gint" c:type="gint"/>
--    </constant>
-     <constant name="BOOL_CONSTANT" value="true" c:type="REGRESS_BOOL_CONSTANT">
-       <source-position filename="regress.h" line="524"/>
-       <type name="gboolean" c:type="gboolean"/>
-@@ -2616,19 +2610,13 @@ exposed to language bindings.</doc>
-     <constant name="GI_SCANNER_ELSE"
-               value="3"
-               c:type="REGRESS_GI_SCANNER_ELSE">
--      <source-position filename="regress.h" line="1543"/>
-+      <source-position filename="regress.h" line="1541"/>
-       <type name="gint" c:type="gint"/>
-     </constant>
-     <constant name="GI_SCANNER_IFDEF"
-               value="3"
-               c:type="REGRESS_GI_SCANNER_IFDEF">
--      <source-position filename="regress.h" line="1547"/>
--      <type name="gint" c:type="gint"/>
--    </constant>
--    <constant name="GOOD_EXPR_CONSTANT"
--              value="-2305843009213693952"
--              c:type="REGRESS_GOOD_EXPR_CONSTANT">
--      <source-position filename="regress.h" line="527"/>
-+      <source-position filename="regress.h" line="1545"/>
-       <type name="gint" c:type="gint"/>
-     </constant>
-     <constant name="GUINT64_CONSTANT"
-@@ -2640,7 +2628,7 @@ exposed to language bindings.</doc>
-     <constant name="GUINT64_CONSTANTA"
-               value="18446744073709551615"
-               c:type="REGRESS_GUINT64_CONSTANTA">
--      <source-position filename="regress.h" line="531"/>
-+      <source-position filename="regress.h" line="529"/>
-       <type name="TestTypeGUInt64" c:type="RegressTestTypeGUInt64"/>
-     </constant>
-     <constant name="G_GINT64_CONSTANT"
-@@ -2656,18 +2644,18 @@ exposed to language bindings.</doc>
-     <record name="Intset" c:type="RegressIntset" disguised="1" opaque="1">
-       <doc xml:space="preserve"
-            filename="regress.h"
--           line="1422">Like telepathy-glib's TpIntset.</doc>
--      <source-position filename="regress.h" line="1428"/>
-+           line="1420">Like telepathy-glib's TpIntset.</doc>
-+      <source-position filename="regress.h" line="1426"/>
-     </record>
-     <constant name="LONG_STRING_CONSTANT"
-               value="TYPE,VALUE,ENCODING,CHARSET,LANGUAGE,DOM,INTL,POSTAL,PARCEL,HOME,WORK,PREF,VOICE,FAX,MSG,CELL,PAGER,BBS,MODEM,CAR,ISDN,VIDEO,AOL,APPLELINK,ATTMAIL,CIS,EWORLD,INTERNET,IBMMAIL,MCIMAIL,POWERSHARE,PRODIGY,TLX,X400,GIF,CGM,WMF,BMP,MET,PMB,DIB,PICT,TIFF,PDF,PS,JPEG,QTIME,MPEG,MPEG2,AVI,WAVE,AIFF,PCM,X509,PGP"
-               c:type="REGRESS_LONG_STRING_CONSTANT">
--      <source-position filename="regress.h" line="1514"/>
-+      <source-position filename="regress.h" line="1512"/>
-       <type name="utf8" c:type="gchar*"/>
-     </constant>
-     <record name="LikeGnomeKeyringPasswordSchema"
-             c:type="RegressLikeGnomeKeyringPasswordSchema">
--      <source-position filename="regress.h" line="1533"/>
-+      <source-position filename="regress.h" line="1531"/>
-       <field name="dummy" writable="1">
-         <type name="gint" c:type="int"/>
-       </field>
-@@ -2681,7 +2669,7 @@ exposed to language bindings.</doc>
-       </field>
-     </record>
-     <record name="LikeXklConfigItem" c:type="RegressLikeXklConfigItem">
--      <source-position filename="regress.h" line="1500"/>
-+      <source-position filename="regress.h" line="1498"/>
-       <field name="name" writable="1">
-         <array zero-terminated="0" fixed-size="32">
-           <type name="gchar" c:type="gchar"/>
-@@ -2689,7 +2677,7 @@ exposed to language bindings.</doc>
-       </field>
-       <method name="set_name"
-               c:identifier="regress_like_xkl_config_item_set_name">
--        <source-position filename="regress.h" line="1504"/>
-+        <source-position filename="regress.h" line="1502"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -2706,13 +2694,13 @@ exposed to language bindings.</doc>
-     <constant name="MAXUINT64"
-               value="18446744073709551615"
-               c:type="REGRESS_MAXUINT64">
--      <source-position filename="regress.h" line="1537"/>
-+      <source-position filename="regress.h" line="1535"/>
-       <type name="guint64" c:type="guint64"/>
-     </constant>
-     <constant name="MININT64"
-               value="-9223372036854775808"
-               c:type="REGRESS_MININT64">
--      <source-position filename="regress.h" line="1536"/>
-+      <source-position filename="regress.h" line="1534"/>
-       <type name="gint64" c:type="gint64"/>
-     </constant>
-     <constant name="Mixed_Case_Constant"
-@@ -2738,9 +2726,9 @@ exposed to language bindings.</doc>
-             introspectable="0">
-       <doc xml:space="preserve"
-            filename="regress.h"
--           line="1404">This should be skipped, and moreover, all function which
-+           line="1402">This should be skipped, and moreover, all function which
- use it should be.</doc>
--      <source-position filename="regress.h" line="1414"/>
-+      <source-position filename="regress.h" line="1412"/>
-       <field name="x" writable="1">
-         <type name="gint" c:type="int"/>
-       </field>
-@@ -2751,7 +2739,7 @@ use it should be.</doc>
-     <function-macro name="TEST_FLOATING"
-                     c:identifier="REGRESS_TEST_FLOATING"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1332"/>
-+      <source-position filename="regress.h" line="1330"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2760,7 +2748,7 @@ use it should be.</doc>
-     <function-macro name="TEST_FLOATING_GET_CLASS"
-                     c:identifier="REGRESS_TEST_FLOATING_GET_CLASS"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1334"/>
-+      <source-position filename="regress.h" line="1332"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2769,7 +2757,7 @@ use it should be.</doc>
-     <function-macro name="TEST_FUNDAMENTAL_OBJECT"
-                     c:identifier="REGRESS_TEST_FUNDAMENTAL_OBJECT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1036"/>
-+      <source-position filename="regress.h" line="1034"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2778,7 +2766,7 @@ use it should be.</doc>
-     <function-macro name="TEST_FUNDAMENTAL_OBJECT_CAST"
-                     c:identifier="REGRESS_TEST_FUNDAMENTAL_OBJECT_CAST"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1038"/>
-+      <source-position filename="regress.h" line="1036"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2787,7 +2775,7 @@ use it should be.</doc>
-     <function-macro name="TEST_FUNDAMENTAL_OBJECT_CLASS"
-                     c:identifier="REGRESS_TEST_FUNDAMENTAL_OBJECT_CLASS"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1037"/>
-+      <source-position filename="regress.h" line="1035"/>
-       <parameters>
-         <parameter name="klass">
-         </parameter>
-@@ -2796,7 +2784,7 @@ use it should be.</doc>
-     <function-macro name="TEST_FUNDAMENTAL_OBJECT_GET_CLASS"
-                     c:identifier="REGRESS_TEST_FUNDAMENTAL_OBJECT_GET_CLASS"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1035"/>
-+      <source-position filename="regress.h" line="1033"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2805,7 +2793,7 @@ use it should be.</doc>
-     <function-macro name="TEST_GNUC_EXTENSION_STMT"
-                     c:identifier="REGRESS_TEST_GNUC_EXTENSION_STMT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1510"/>
-+      <source-position filename="regress.h" line="1508"/>
-       <parameters>
-         <parameter name="foo">
-         </parameter>
-@@ -2814,7 +2802,7 @@ use it should be.</doc>
-     <function-macro name="TEST_INTERFACE"
-                     c:identifier="REGRESS_TEST_INTERFACE"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1280"/>
-+      <source-position filename="regress.h" line="1278"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2823,7 +2811,7 @@ use it should be.</doc>
-     <function-macro name="TEST_INTERFACE_GET_IFACE"
-                     c:identifier="REGRESS_TEST_INTERFACE_GET_IFACE"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1282"/>
-+      <source-position filename="regress.h" line="1280"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2832,7 +2820,7 @@ use it should be.</doc>
-     <function-macro name="TEST_IS_FLOATING"
-                     c:identifier="REGRESS_TEST_IS_FLOATING"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1333"/>
-+      <source-position filename="regress.h" line="1331"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2841,7 +2829,7 @@ use it should be.</doc>
-     <function-macro name="TEST_IS_FUNDAMENTAL_OBJECT"
-                     c:identifier="REGRESS_TEST_IS_FUNDAMENTAL_OBJECT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1033"/>
-+      <source-position filename="regress.h" line="1031"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2850,7 +2838,7 @@ use it should be.</doc>
-     <function-macro name="TEST_IS_FUNDAMENTAL_OBJECT_CLASS"
-                     c:identifier="REGRESS_TEST_IS_FUNDAMENTAL_OBJECT_CLASS"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1034"/>
-+      <source-position filename="regress.h" line="1032"/>
-       <parameters>
-         <parameter name="klass">
-         </parameter>
-@@ -2859,7 +2847,7 @@ use it should be.</doc>
-     <function-macro name="TEST_IS_INTERFACE"
-                     c:identifier="REGRESS_TEST_IS_INTERFACE"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1281"/>
-+      <source-position filename="regress.h" line="1279"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2868,7 +2856,7 @@ use it should be.</doc>
-     <function-macro name="TEST_IS_OBJECT"
-                     c:identifier="REGRESS_TEST_IS_OBJECT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="777"/>
-+      <source-position filename="regress.h" line="775"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2877,7 +2865,7 @@ use it should be.</doc>
-     <function-macro name="TEST_IS_SUB_OBJECT"
-                     c:identifier="REGRESS_TEST_IS_SUB_OBJECT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="999"/>
-+      <source-position filename="regress.h" line="997"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2886,7 +2874,7 @@ use it should be.</doc>
-     <function-macro name="TEST_IS_WI_802_1X"
-                     c:identifier="REGRESS_TEST_IS_WI_802_1X"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1299"/>
-+      <source-position filename="regress.h" line="1297"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2895,7 +2883,7 @@ use it should be.</doc>
-     <function-macro name="TEST_OBJECT"
-                     c:identifier="REGRESS_TEST_OBJECT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="776"/>
-+      <source-position filename="regress.h" line="774"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2904,7 +2892,7 @@ use it should be.</doc>
-     <function-macro name="TEST_OBJ_GET_CLASS"
-                     c:identifier="REGRESS_TEST_OBJ_GET_CLASS"
-                     introspectable="0">
--      <source-position filename="regress.h" line="778"/>
-+      <source-position filename="regress.h" line="776"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2913,7 +2901,7 @@ use it should be.</doc>
-     <function-macro name="TEST_SUB_OBJECT"
-                     c:identifier="REGRESS_TEST_SUB_OBJECT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="998"/>
-+      <source-position filename="regress.h" line="996"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2922,7 +2910,7 @@ use it should be.</doc>
-     <function-macro name="TEST_SUB_OBJ_GET_CLASS"
-                     c:identifier="REGRESS_TEST_SUB_OBJ_GET_CLASS"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1000"/>
-+      <source-position filename="regress.h" line="998"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2931,7 +2919,7 @@ use it should be.</doc>
-     <function-macro name="TEST_VALUE_HOLDS_FUNDAMENTAL_OBJECT"
-                     c:identifier="REGRESS_TEST_VALUE_HOLDS_FUNDAMENTAL_OBJECT"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1073"/>
-+      <source-position filename="regress.h" line="1071"/>
-       <parameters>
-         <parameter name="value">
-         </parameter>
-@@ -2940,7 +2928,7 @@ use it should be.</doc>
-     <function-macro name="TEST_WI_802_1X"
-                     c:identifier="REGRESS_TEST_WI_802_1X"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1298"/>
-+      <source-position filename="regress.h" line="1296"/>
-       <parameters>
-         <parameter name="object">
-         </parameter>
-@@ -2949,7 +2937,7 @@ use it should be.</doc>
-     <function-macro name="TEST_WI_802_1X_GET_CLASS"
-                     c:identifier="REGRESS_TEST_WI_802_1X_GET_CLASS"
-                     introspectable="0">
--      <source-position filename="regress.h" line="1300"/>
-+      <source-position filename="regress.h" line="1298"/>
-       <parameters>
-         <parameter name="obj">
-         </parameter>
-@@ -2989,7 +2977,7 @@ use it should be.</doc>
-             glib:type-name="RegressTestBoxed"
-             glib:get-type="regress_test_boxed_get_type"
-             c:symbol-prefix="test_boxed">
--      <source-position filename="regress.h" line="685"/>
-+      <source-position filename="regress.h" line="683"/>
-       <field name="some_int8" writable="1">
-         <type name="gint8" c:type="gint8"/>
-       </field>
-@@ -3000,14 +2988,14 @@ use it should be.</doc>
-         <type name="TestBoxedPrivate" c:type="RegressTestBoxedPrivate*"/>
-       </field>
-       <constructor name="new" c:identifier="regress_test_boxed_new">
--        <source-position filename="regress.h" line="691"/>
-+        <source-position filename="regress.h" line="689"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxed" c:type="RegressTestBoxed*"/>
-         </return-value>
-       </constructor>
-       <constructor name="new_alternative_constructor1"
-                    c:identifier="regress_test_boxed_new_alternative_constructor1">
--        <source-position filename="regress.h" line="694"/>
-+        <source-position filename="regress.h" line="692"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxed" c:type="RegressTestBoxed*"/>
-         </return-value>
-@@ -3019,7 +3007,7 @@ use it should be.</doc>
-       </constructor>
-       <constructor name="new_alternative_constructor2"
-                    c:identifier="regress_test_boxed_new_alternative_constructor2">
--        <source-position filename="regress.h" line="697"/>
-+        <source-position filename="regress.h" line="695"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxed" c:type="RegressTestBoxed*"/>
-         </return-value>
-@@ -3034,7 +3022,7 @@ use it should be.</doc>
-       </constructor>
-       <constructor name="new_alternative_constructor3"
-                    c:identifier="regress_test_boxed_new_alternative_constructor3">
--        <source-position filename="regress.h" line="700"/>
-+        <source-position filename="regress.h" line="698"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxed" c:type="RegressTestBoxed*"/>
-         </return-value>
-@@ -3047,7 +3035,7 @@ use it should be.</doc>
-       <method name="_not_a_method"
-               c:identifier="regress_test_boxeds_not_a_method"
-               moved-to="test_boxeds_not_a_method">
--        <source-position filename="regress.h" line="712"/>
-+        <source-position filename="regress.h" line="710"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -3058,7 +3046,7 @@ use it should be.</doc>
-         </parameters>
-       </method>
-       <method name="copy" c:identifier="regress_test_boxed_copy">
--        <source-position filename="regress.h" line="704"/>
-+        <source-position filename="regress.h" line="702"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxed" c:type="RegressTestBoxed*"/>
-         </return-value>
-@@ -3069,7 +3057,7 @@ use it should be.</doc>
-         </parameters>
-       </method>
-       <method name="equals" c:identifier="regress_test_boxed_equals">
--        <source-position filename="regress.h" line="707"/>
-+        <source-position filename="regress.h" line="705"/>
-         <return-value transfer-ownership="none">
-           <type name="gboolean" c:type="gboolean"/>
-         </return-value>
-@@ -3088,7 +3076,7 @@ use it should be.</doc>
-             glib:type-name="RegressTestBoxedB"
-             glib:get-type="regress_test_boxed_b_get_type"
-             c:symbol-prefix="test_boxed_b">
--      <source-position filename="regress.h" line="723"/>
-+      <source-position filename="regress.h" line="721"/>
-       <field name="some_int8" writable="1">
-         <type name="gint8" c:type="gint8"/>
-       </field>
-@@ -3096,7 +3084,7 @@ use it should be.</doc>
-         <type name="glong" c:type="glong"/>
-       </field>
-       <constructor name="new" c:identifier="regress_test_boxed_b_new">
--        <source-position filename="regress.h" line="730"/>
-+        <source-position filename="regress.h" line="728"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxedB" c:type="RegressTestBoxedB*"/>
-         </return-value>
-@@ -3110,7 +3098,7 @@ use it should be.</doc>
-         </parameters>
-       </constructor>
-       <method name="copy" c:identifier="regress_test_boxed_b_copy">
--        <source-position filename="regress.h" line="733"/>
-+        <source-position filename="regress.h" line="731"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxedB" c:type="RegressTestBoxedB*"/>
-         </return-value>
-@@ -3126,7 +3114,7 @@ use it should be.</doc>
-             glib:type-name="RegressTestBoxedC"
-             glib:get-type="regress_test_boxed_c_get_type"
-             c:symbol-prefix="test_boxed_c">
--      <source-position filename="regress.h" line="741"/>
-+      <source-position filename="regress.h" line="739"/>
-       <field name="refcount" writable="1">
-         <type name="guint" c:type="guint"/>
-       </field>
-@@ -3134,7 +3122,7 @@ use it should be.</doc>
-         <type name="guint" c:type="guint"/>
-       </field>
-       <constructor name="new" c:identifier="regress_test_boxed_c_new">
--        <source-position filename="regress.h" line="747"/>
-+        <source-position filename="regress.h" line="745"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxedC" c:type="RegressTestBoxedC*"/>
-         </return-value>
-@@ -3148,9 +3136,9 @@ use it should be.</doc>
-             glib:type-name="RegressTestBoxedD"
-             glib:get-type="regress_test_boxed_d_get_type"
-             c:symbol-prefix="test_boxed_d">
--      <source-position filename="regress.h" line="754"/>
-+      <source-position filename="regress.h" line="752"/>
-       <constructor name="new" c:identifier="regress_test_boxed_d_new">
--        <source-position filename="regress.h" line="762"/>
-+        <source-position filename="regress.h" line="760"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxedD" c:type="RegressTestBoxedD*"/>
-         </return-value>
-@@ -3164,7 +3152,7 @@ use it should be.</doc>
-         </parameters>
-       </constructor>
-       <method name="copy" c:identifier="regress_test_boxed_d_copy">
--        <source-position filename="regress.h" line="765"/>
-+        <source-position filename="regress.h" line="763"/>
-         <return-value transfer-ownership="full">
-           <type name="TestBoxedD" c:type="RegressTestBoxedD*"/>
-         </return-value>
-@@ -3175,7 +3163,7 @@ use it should be.</doc>
-         </parameters>
-       </method>
-       <method name="free" c:identifier="regress_test_boxed_d_free">
--        <source-position filename="regress.h" line="768"/>
-+        <source-position filename="regress.h" line="766"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -3186,7 +3174,7 @@ use it should be.</doc>
-         </parameters>
-       </method>
-       <method name="get_magic" c:identifier="regress_test_boxed_d_get_magic">
--        <source-position filename="regress.h" line="772"/>
-+        <source-position filename="regress.h" line="770"/>
-         <return-value transfer-ownership="none">
-           <type name="gint" c:type="int"/>
-         </return-value>
-@@ -3201,16 +3189,16 @@ use it should be.</doc>
-             c:type="RegressTestBoxedPrivate"
-             disguised="1"
-             opaque="1">
--      <source-position filename="regress.h" line="677"/>
-+      <source-position filename="regress.h" line="675"/>
-     </record>
-     <callback name="TestCallback" c:type="RegressTestCallback">
--      <source-position filename="regress.h" line="1160"/>
-+      <source-position filename="regress.h" line="1158"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-     </callback>
-     <callback name="TestCallbackArray" c:type="RegressTestCallbackArray">
--      <source-position filename="regress.h" line="1192"/>
-+      <source-position filename="regress.h" line="1190"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -3235,7 +3223,7 @@ use it should be.</doc>
-     </callback>
-     <callback name="TestCallbackArrayInOut"
-               c:type="RegressTestCallbackArrayInOut">
--      <source-position filename="regress.h" line="1198"/>
-+      <source-position filename="regress.h" line="1196"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -3257,7 +3245,7 @@ use it should be.</doc>
-       </parameters>
-     </callback>
-     <callback name="TestCallbackFull" c:type="RegressTestCallbackFull">
--      <source-position filename="regress.h" line="1179"/>
-+      <source-position filename="regress.h" line="1177"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -3265,25 +3253,25 @@ use it should be.</doc>
-         <parameter name="foo" transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.h"
--               line="1175">the investment rate</doc>
-+               line="1173">the investment rate</doc>
-           <type name="gint" c:type="int"/>
-         </parameter>
-         <parameter name="bar" transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.h"
--               line="1176">how much money</doc>
-+               line="1174">how much money</doc>
-           <type name="gdouble" c:type="double"/>
-         </parameter>
-         <parameter name="path" transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.h"
--               line="1177">Path to file</doc>
-+               line="1175">Path to file</doc>
-           <type name="filename" c:type="char*"/>
-         </parameter>
-       </parameters>
-     </callback>
-     <callback name="TestCallbackGError" c:type="RegressTestCallbackGError">
--      <source-position filename="regress.h" line="1167"/>
-+      <source-position filename="regress.h" line="1165"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -3295,7 +3283,7 @@ use it should be.</doc>
-     </callback>
-     <callback name="TestCallbackHashtable"
-               c:type="RegressTestCallbackHashtable">
--      <source-position filename="regress.h" line="1166"/>
-+      <source-position filename="regress.h" line="1164"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -3303,7 +3291,7 @@ use it should be.</doc>
-         <parameter name="data" transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.h"
--               line="1164">a hash table; will be modified</doc>
-+               line="1162">a hash table; will be modified</doc>
-           <type name="GLib.HashTable" c:type="GHashTable*">
-             <type name="utf8"/>
-             <type name="gint"/>
-@@ -3313,7 +3301,7 @@ use it should be.</doc>
-     </callback>
-     <callback name="TestCallbackOwnedGError"
-               c:type="RegressTestCallbackOwnedGError">
--      <source-position filename="regress.h" line="1172"/>
-+      <source-position filename="regress.h" line="1170"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -3321,20 +3309,20 @@ use it should be.</doc>
-         <parameter name="error" transfer-ownership="full">
-           <doc xml:space="preserve"
-                filename="regress.h"
--               line="1170">GError instance; must be freed by the callback</doc>
-+               line="1168">GError instance; must be freed by the callback</doc>
-           <type name="GLib.Error" c:type="GError*"/>
-         </parameter>
-       </parameters>
-     </callback>
-     <callback name="TestCallbackReturnFull"
-               c:type="RegressTestCallbackReturnFull">
--      <source-position filename="regress.h" line="1184"/>
-+      <source-position filename="regress.h" line="1182"/>
-       <return-value transfer-ownership="full">
-         <type name="TestObj" c:type="RegressTestObj*"/>
-       </return-value>
-     </callback>
-     <callback name="TestCallbackUserData" c:type="RegressTestCallbackUserData">
--      <source-position filename="regress.h" line="1161"/>
-+      <source-position filename="regress.h" line="1159"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -3473,7 +3461,7 @@ use it should be.</doc>
-     </enumeration>
-     <callback name="TestExternallyDefinedCallback"
-               c:type="RegressTestExternallyDefinedCallback">
--      <source-position filename="regress.h" line="807"/>
-+      <source-position filename="regress.h" line="805"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -3516,9 +3504,9 @@ use it should be.</doc>
-            glib:type-name="RegressTestFloating"
-            glib:get-type="regress_test_floating_get_type"
-            glib:type-struct="TestFloatingClass">
--      <source-position filename="regress.h" line="1344"/>
-+      <source-position filename="regress.h" line="1342"/>
-       <constructor name="new" c:identifier="regress_test_floating_new">
--        <source-position filename="regress.h" line="1351"/>
-+        <source-position filename="regress.h" line="1349"/>
-         <return-value transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.c"
-@@ -3533,7 +3521,7 @@ use it should be.</doc>
-     <record name="TestFloatingClass"
-             c:type="RegressTestFloatingClass"
-             glib:is-gtype-struct-for="TestFloating">
--      <source-position filename="regress.h" line="1344"/>
-+      <source-position filename="regress.h" line="1342"/>
-       <field name="parent_class">
-         <type name="GObject.InitiallyUnownedClass"
-               c:type="GInitiallyUnownedClass"/>
-@@ -3551,9 +3539,9 @@ use it should be.</doc>
-            glib:unref-func="regress_test_fundamental_object_unref"
-            glib:set-value-func="regress_test_value_set_fundamental_object"
-            glib:get-value-func="regress_test_value_get_fundamental_object">
--      <source-position filename="regress.h" line="1062"/>
-+      <source-position filename="regress.h" line="1060"/>
-       <virtual-method name="copy">
--        <source-position filename="regress.h" line="1047"/>
-+        <source-position filename="regress.h" line="1045"/>
-         <return-value transfer-ownership="full">
-           <type name="TestFundamentalObject"
-                 c:type="RegressTestFundamentalObject*"/>
-@@ -3566,7 +3554,7 @@ use it should be.</doc>
-         </parameters>
-       </virtual-method>
-       <virtual-method name="finalize">
--        <source-position filename="regress.h" line="1048"/>
-+        <source-position filename="regress.h" line="1046"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -3578,7 +3566,7 @@ use it should be.</doc>
-         </parameters>
-       </virtual-method>
-       <method name="ref" c:identifier="regress_test_fundamental_object_ref">
--        <source-position filename="regress.h" line="1068"/>
-+        <source-position filename="regress.h" line="1066"/>
-         <return-value transfer-ownership="full">
-           <doc xml:space="preserve"
-                filename="regress.c"
-@@ -3596,7 +3584,7 @@ use it should be.</doc>
-       </method>
-       <method name="unref"
-               c:identifier="regress_test_fundamental_object_unref">
--        <source-position filename="regress.h" line="1071"/>
-+        <source-position filename="regress.h" line="1069"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -3621,7 +3609,7 @@ use it should be.</doc>
-     <record name="TestFundamentalObjectClass"
-             c:type="RegressTestFundamentalObjectClass"
-             glib:is-gtype-struct-for="TestFundamentalObject">
--      <source-position filename="regress.h" line="1062"/>
-+      <source-position filename="regress.h" line="1060"/>
-       <field name="type_class">
-         <type name="GObject.TypeClass" c:type="GTypeClass"/>
-       </field>
-@@ -3636,7 +3624,7 @@ use it should be.</doc>
-     </record>
-     <callback name="TestFundamentalObjectCopyFunction"
-               c:type="RegressTestFundamentalObjectCopyFunction">
--      <source-position filename="regress.h" line="1047"/>
-+      <source-position filename="regress.h" line="1045"/>
-       <return-value transfer-ownership="full">
-         <type name="TestFundamentalObject"
-               c:type="RegressTestFundamentalObject*"/>
-@@ -3650,7 +3638,7 @@ use it should be.</doc>
-     </callback>
-     <callback name="TestFundamentalObjectFinalizeFunction"
-               c:type="RegressTestFundamentalObjectFinalizeFunction">
--      <source-position filename="regress.h" line="1048"/>
-+      <source-position filename="regress.h" line="1046"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -3673,10 +3661,10 @@ use it should be.</doc>
-       <doc xml:space="preserve"
-            filename="regress.c"
-            line="3763">Just like a #RegressTestFundamentalObject but without gvalue setter and getter</doc>
--      <source-position filename="regress.h" line="1110"/>
-+      <source-position filename="regress.h" line="1108"/>
-       <constructor name="new"
-                    c:identifier="regress_test_fundamental_object_no_get_set_func_new">
--        <source-position filename="regress.h" line="1143"/>
-+        <source-position filename="regress.h" line="1141"/>
-         <return-value transfer-ownership="full">
-           <type name="TestFundamentalObjectNoGetSetFunc"
-                 c:type="RegressTestFundamentalObjectNoGetSetFunc*"/>
-@@ -3689,14 +3677,14 @@ use it should be.</doc>
-       </constructor>
-       <function name="make_compatible_with_fundamental_sub_object"
-                 c:identifier="regress_test_fundamental_object_no_get_set_func_make_compatible_with_fundamental_sub_object">
--        <source-position filename="regress.h" line="1155"/>
-+        <source-position filename="regress.h" line="1153"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-       </function>
-       <method name="get_data"
-               c:identifier="regress_test_fundamental_object_no_get_set_func_get_data">
--        <source-position filename="regress.h" line="1147"/>
-+        <source-position filename="regress.h" line="1145"/>
-         <return-value transfer-ownership="none">
-           <type name="utf8" c:type="const char*"/>
-         </return-value>
-@@ -3718,7 +3706,7 @@ use it should be.</doc>
-     <record name="TestFundamentalObjectNoGetSetFuncClass"
-             c:type="RegressTestFundamentalObjectNoGetSetFuncClass"
-             glib:is-gtype-struct-for="TestFundamentalObjectNoGetSetFunc">
--      <source-position filename="regress.h" line="1110"/>
-+      <source-position filename="regress.h" line="1108"/>
-       <field name="fundamental_object_class">
-         <type name="TestFundamentalObjectClass"
-               c:type="RegressTestFundamentalObjectClass"/>
-@@ -3732,10 +3720,10 @@ use it should be.</doc>
-            glib:get-type="regress_test_fundamental_sub_object_get_type"
-            glib:type-struct="TestFundamentalSubObjectClass"
-            glib:fundamental="1">
--      <source-position filename="regress.h" line="1092"/>
-+      <source-position filename="regress.h" line="1090"/>
-       <constructor name="new"
-                    c:identifier="regress_test_fundamental_sub_object_new">
--        <source-position filename="regress.h" line="1135"/>
-+        <source-position filename="regress.h" line="1133"/>
-         <return-value transfer-ownership="full">
-           <type name="TestFundamentalSubObject"
-                 c:type="RegressTestFundamentalSubObject*"/>
-@@ -3757,7 +3745,7 @@ use it should be.</doc>
-     <record name="TestFundamentalSubObjectClass"
-             c:type="RegressTestFundamentalSubObjectClass"
-             glib:is-gtype-struct-for="TestFundamentalSubObject">
--      <source-position filename="regress.h" line="1092"/>
-+      <source-position filename="regress.h" line="1090"/>
-       <field name="fundamental_object_class">
-         <type name="TestFundamentalObjectClass"
-               c:type="RegressTestFundamentalObjectClass"/>
-@@ -3771,10 +3759,10 @@ use it should be.</doc>
-            glib:get-type="regress_test_fundamental_sub_object_no_get_set_func_get_type"
-            glib:type-struct="TestFundamentalSubObjectNoGetSetFuncClass"
-            glib:fundamental="1">
--      <source-position filename="regress.h" line="1125"/>
-+      <source-position filename="regress.h" line="1123"/>
-       <constructor name="new"
-                    c:identifier="regress_test_fundamental_sub_object_no_get_set_func_new">
--        <source-position filename="regress.h" line="1151"/>
-+        <source-position filename="regress.h" line="1149"/>
-         <return-value transfer-ownership="full">
-           <type name="TestFundamentalSubObjectNoGetSetFunc"
-                 c:type="RegressTestFundamentalSubObjectNoGetSetFunc*"/>
-@@ -3793,7 +3781,7 @@ use it should be.</doc>
-     <record name="TestFundamentalSubObjectNoGetSetFuncClass"
-             c:type="RegressTestFundamentalSubObjectNoGetSetFuncClass"
-             glib:is-gtype-struct-for="TestFundamentalSubObjectNoGetSetFunc">
--      <source-position filename="regress.h" line="1125"/>
-+      <source-position filename="regress.h" line="1123"/>
-       <field name="fundamental_object_class">
-         <type name="TestFundamentalObjectNoGetSetFuncClass"
-               c:type="RegressTestFundamentalObjectNoGetSetFuncClass"/>
-@@ -3917,10 +3905,10 @@ use it should be.</doc>
-                glib:type-name="RegressTestInterface"
-                glib:get-type="regress_test_interface_get_type"
-                glib:type-struct="TestInterfaceIface">
--      <source-position filename="regress.h" line="1288"/>
-+      <source-position filename="regress.h" line="1286"/>
-       <method name="emit_signal"
-               c:identifier="regress_test_interface_emit_signal">
--        <source-position filename="regress.h" line="1294"/>
-+        <source-position filename="regress.h" line="1292"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -3958,13 +3946,13 @@ use it should be.</doc>
-     <record name="TestInterfaceIface"
-             c:type="RegressTestInterfaceIface"
-             glib:is-gtype-struct-for="TestInterface">
--      <source-position filename="regress.h" line="1288"/>
-+      <source-position filename="regress.h" line="1286"/>
-       <field name="base_iface">
-         <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
-       </field>
-     </record>
-     <callback name="TestNoPtrCallback" c:type="RegressTestNoPtrCallback">
--      <source-position filename="regress.h" line="1159"/>
-+      <source-position filename="regress.h" line="1157"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -3976,15 +3964,15 @@ use it should be.</doc>
-            glib:type-name="RegressTestObj"
-            glib:get-type="regress_test_obj_get_type"
-            glib:type-struct="TestObjClass">
--      <source-position filename="regress.h" line="829"/>
-+      <source-position filename="regress.h" line="827"/>
-       <constructor name="constructor" c:identifier="regress_constructor">
--        <source-position filename="regress.h" line="838"/>
-+        <source-position filename="regress.h" line="836"/>
-         <return-value transfer-ownership="full">
-           <type name="TestObj" c:type="RegressTestObj*"/>
-         </return-value>
-       </constructor>
-       <constructor name="new" c:identifier="regress_test_obj_new">
--        <source-position filename="regress.h" line="835"/>
-+        <source-position filename="regress.h" line="833"/>
-         <return-value transfer-ownership="full">
-           <type name="TestObj" c:type="RegressTestObj*"/>
-         </return-value>
-@@ -3999,7 +3987,7 @@ use it should be.</doc>
-       </constructor>
-       <constructor name="new_callback"
-                    c:identifier="regress_test_obj_new_callback">
--        <source-position filename="regress.h" line="1256"/>
-+        <source-position filename="regress.h" line="1254"/>
-         <return-value transfer-ownership="full">
-           <type name="TestObj" c:type="RegressTestObj*"/>
-         </return-value>
-@@ -4026,7 +4014,7 @@ use it should be.</doc>
-       <constructor name="new_from_file"
-                    c:identifier="regress_test_obj_new_from_file"
-                    throws="1">
--        <source-position filename="regress.h" line="841"/>
-+        <source-position filename="regress.h" line="839"/>
-         <return-value transfer-ownership="full">
-           <type name="TestObj" c:type="RegressTestObj*"/>
-         </return-value>
-@@ -4037,7 +4025,7 @@ use it should be.</doc>
-         </parameters>
-       </constructor>
-       <function name="null_out" c:identifier="regress_test_obj_null_out">
--        <source-position filename="regress.h" line="982"/>
-+        <source-position filename="regress.h" line="980"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4057,7 +4045,7 @@ use it should be.</doc>
-       </function>
-       <function name="static_method"
-                 c:identifier="regress_test_obj_static_method">
--        <source-position filename="regress.h" line="883"/>
-+        <source-position filename="regress.h" line="881"/>
-         <return-value transfer-ownership="none">
-           <type name="gdouble" c:type="double"/>
-         </return-value>
-@@ -4069,7 +4057,7 @@ use it should be.</doc>
-       </function>
-       <function name="static_method_callback"
-                 c:identifier="regress_test_obj_static_method_callback">
--        <source-position filename="regress.h" line="1253"/>
-+        <source-position filename="regress.h" line="1251"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4084,7 +4072,7 @@ use it should be.</doc>
-         </parameters>
-       </function>
-       <virtual-method name="allow_none_vfunc">
--        <source-position filename="regress.h" line="819"/>
-+        <source-position filename="regress.h" line="817"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4098,13 +4086,13 @@ use it should be.</doc>
-                      allow-none="1">
-             <doc xml:space="preserve"
-                  filename="regress.h"
--                 line="817">Another object</doc>
-+                 line="815">Another object</doc>
-             <type name="TestObj" c:type="RegressTestObj*"/>
-           </parameter>
-         </parameters>
-       </virtual-method>
-       <virtual-method name="complex_vfunc">
--        <source-position filename="regress.h" line="807"/>
-+        <source-position filename="regress.h" line="805"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4123,7 +4111,7 @@ use it should be.</doc>
-              line="3221">This method is virtual.  Notably its name differs from the virtual
- slot name, which makes it useful for testing bindings handle this
- case.</doc>
--        <source-position filename="regress.h" line="813"/>
-+        <source-position filename="regress.h" line="811"/>
-         <return-value transfer-ownership="none">
-           <type name="gint" c:type="int"/>
-         </return-value>
-@@ -4148,7 +4136,7 @@ case.</doc>
-              line="3221">This method is virtual.  Notably its name differs from the virtual
- slot name, which makes it useful for testing bindings handle this
- case.</doc>
--        <source-position filename="regress.h" line="975"/>
-+        <source-position filename="regress.h" line="973"/>
-         <return-value transfer-ownership="none">
-           <type name="gint" c:type="int"/>
-         </return-value>
-@@ -4169,7 +4157,7 @@ case.</doc>
-       </method>
-       <method name="emit_sig_with_array_len_prop"
-               c:identifier="regress_test_obj_emit_sig_with_array_len_prop">
--        <source-position filename="regress.h" line="865"/>
-+        <source-position filename="regress.h" line="863"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4181,7 +4169,7 @@ case.</doc>
-       </method>
-       <method name="emit_sig_with_error"
-               c:identifier="regress_test_obj_emit_sig_with_error">
--        <source-position filename="regress.h" line="871"/>
-+        <source-position filename="regress.h" line="869"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4196,7 +4184,7 @@ case.</doc>
-       </method>
-       <method name="emit_sig_with_foreign_struct"
-               c:identifier="regress_test_obj_emit_sig_with_foreign_struct">
--        <source-position filename="regress.h" line="856"/>
-+        <source-position filename="regress.h" line="854"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4211,7 +4199,7 @@ case.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="2926">The signal handler must increment the inout parameter by 1.</doc>
--        <source-position filename="regress.h" line="868"/>
-+        <source-position filename="regress.h" line="866"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4226,7 +4214,7 @@ case.</doc>
-       </method>
-       <method name="emit_sig_with_int64"
-               c:identifier="regress_test_obj_emit_sig_with_int64">
--        <source-position filename="regress.h" line="859"/>
-+        <source-position filename="regress.h" line="857"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4238,7 +4226,7 @@ case.</doc>
-       </method>
-       <method name="emit_sig_with_null_error"
-               c:identifier="regress_test_obj_emit_sig_with_null_error">
--        <source-position filename="regress.h" line="874"/>
-+        <source-position filename="regress.h" line="872"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4253,7 +4241,7 @@ case.</doc>
-       </method>
-       <method name="emit_sig_with_obj"
-               c:identifier="regress_test_obj_emit_sig_with_obj">
--        <source-position filename="regress.h" line="853"/>
-+        <source-position filename="regress.h" line="851"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4265,7 +4253,7 @@ case.</doc>
-       </method>
-       <method name="emit_sig_with_uint64"
-               c:identifier="regress_test_obj_emit_sig_with_uint64">
--        <source-position filename="regress.h" line="862"/>
-+        <source-position filename="regress.h" line="860"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4276,7 +4264,7 @@ case.</doc>
-         </parameters>
-       </method>
-       <method name="forced_method" c:identifier="regress_forced_method">
--        <source-position filename="regress.h" line="886"/>
-+        <source-position filename="regress.h" line="884"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4292,7 +4280,7 @@ case.</doc>
-       <method name="get_string"
-               c:identifier="regress_test_obj_get_string"
-               glib:get-property="string">
--        <source-position filename="regress.h" line="850"/>
-+        <source-position filename="regress.h" line="848"/>
-         <return-value transfer-ownership="none">
-           <type name="utf8" c:type="const char*"/>
-         </return-value>
-@@ -4304,7 +4292,7 @@ case.</doc>
-       </method>
-       <method name="instance_method"
-               c:identifier="regress_test_obj_instance_method">
--        <source-position filename="regress.h" line="877"/>
-+        <source-position filename="regress.h" line="875"/>
-         <return-value transfer-ownership="none">
-           <type name="gint" c:type="int"/>
-         </return-value>
-@@ -4316,7 +4304,7 @@ case.</doc>
-       </method>
-       <method name="instance_method_callback"
-               c:identifier="regress_test_obj_instance_method_callback">
--        <source-position filename="regress.h" line="1250"/>
-+        <source-position filename="regress.h" line="1248"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4335,7 +4323,7 @@ case.</doc>
-       </method>
-       <method name="instance_method_full"
-               c:identifier="regress_test_obj_instance_method_full">
--        <source-position filename="regress.h" line="880"/>
-+        <source-position filename="regress.h" line="878"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4347,7 +4335,7 @@ case.</doc>
-       </method>
-       <method name="name_conflict"
-               c:identifier="regress_test_obj_name_conflict">
--        <source-position filename="regress.h" line="994"/>
-+        <source-position filename="regress.h" line="992"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4362,7 +4350,7 @@ case.</doc>
-       </method>
-       <method name="not_nullable_element_typed_gpointer_in"
-               c:identifier="regress_test_obj_not_nullable_element_typed_gpointer_in">
--        <source-position filename="regress.h" line="989"/>
-+        <source-position filename="regress.h" line="987"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4391,7 +4379,7 @@ case.</doc>
-       </method>
-       <method name="not_nullable_typed_gpointer_in"
-               c:identifier="regress_test_obj_not_nullable_typed_gpointer_in">
--        <source-position filename="regress.h" line="986"/>
-+        <source-position filename="regress.h" line="984"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4413,7 +4401,7 @@ case.</doc>
-       <method name="set_bare"
-               c:identifier="regress_test_obj_set_bare"
-               glib:set-property="bare">
--        <source-position filename="regress.h" line="844"/>
-+        <source-position filename="regress.h" line="842"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4432,7 +4420,7 @@ case.</doc>
-       <method name="set_string"
-               c:identifier="regress_test_obj_set_string"
-               glib:set-property="string">
--        <source-position filename="regress.h" line="847"/>
-+        <source-position filename="regress.h" line="845"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4451,7 +4439,7 @@ case.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="3185">Check that the out value is skipped</doc>
--        <source-position filename="regress.h" line="963"/>
-+        <source-position filename="regress.h" line="961"/>
-         <return-value transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.c"
-@@ -4525,7 +4513,7 @@ case.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="3149">Check that the out value is skipped</doc>
--        <source-position filename="regress.h" line="951"/>
-+        <source-position filename="regress.h" line="949"/>
-         <return-value transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.c"
-@@ -4599,7 +4587,7 @@ case.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="3113">Check that a parameter is skipped</doc>
--        <source-position filename="regress.h" line="939"/>
-+        <source-position filename="regress.h" line="937"/>
-         <return-value transfer-ownership="none">
-           <doc xml:space="preserve"
-                filename="regress.c"
-@@ -4672,7 +4660,7 @@ case.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="3053">Check that the return value is skipped</doc>
--        <source-position filename="regress.h" line="921"/>
-+        <source-position filename="regress.h" line="919"/>
-         <return-value transfer-ownership="none" skip="1">
-           <doc xml:space="preserve"
-                filename="regress.c"
-@@ -4746,7 +4734,7 @@ case.</doc>
-              filename="regress.c"
-              line="3089">Check that the return value is skipped. Succeed if a is nonzero, otherwise
- raise an error.</doc>
--        <source-position filename="regress.h" line="933"/>
-+        <source-position filename="regress.h" line="931"/>
-         <return-value transfer-ownership="none" skip="1">
-           <doc xml:space="preserve"
-                filename="regress.c"
-@@ -4770,7 +4758,7 @@ raise an error.</doc>
-       </method>
-       <method name="torture_signature_0"
-               c:identifier="regress_test_obj_torture_signature_0">
--        <source-position filename="regress.h" line="901"/>
-+        <source-position filename="regress.h" line="899"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -4816,7 +4804,7 @@ raise an error.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="3021">This function throws an error if m is odd.</doc>
--        <source-position filename="regress.h" line="910"/>
-+        <source-position filename="regress.h" line="908"/>
-         <return-value transfer-ownership="none">
-           <type name="gboolean" c:type="gboolean"/>
-         </return-value>
-@@ -4996,7 +4984,7 @@ raise an error.</doc>
-       </field>
-       <field name="function_ptr">
-         <callback name="function_ptr">
--          <source-position filename="regress.h" line="804"/>
-+          <source-position filename="regress.h" line="802"/>
-           <return-value transfer-ownership="none">
-             <type name="none" c:type="void"/>
-           </return-value>
-@@ -5253,13 +5241,13 @@ the introspection client langage.</doc>
-     <record name="TestObjClass"
-             c:type="RegressTestObjClass"
-             glib:is-gtype-struct-for="TestObj">
--      <source-position filename="regress.h" line="829"/>
-+      <source-position filename="regress.h" line="827"/>
-       <field name="parent_class">
-         <type name="GObject.ObjectClass" c:type="GObjectClass"/>
-       </field>
-       <field name="matrix">
-         <callback name="matrix">
--          <source-position filename="regress.h" line="813"/>
-+          <source-position filename="regress.h" line="811"/>
-           <return-value transfer-ownership="none">
-             <type name="gint" c:type="int"/>
-           </return-value>
-@@ -5281,7 +5269,7 @@ the introspection client langage.</doc>
-       </field>
-       <field name="allow_none_vfunc">
-         <callback name="allow_none_vfunc">
--          <source-position filename="regress.h" line="819"/>
-+          <source-position filename="regress.h" line="817"/>
-           <return-value transfer-ownership="none">
-             <type name="none" c:type="void"/>
-           </return-value>
-@@ -5295,7 +5283,7 @@ the introspection client langage.</doc>
-                        allow-none="1">
-               <doc xml:space="preserve"
-                    filename="regress.h"
--                   line="817">Another object</doc>
-+                   line="815">Another object</doc>
-               <type name="TestObj" c:type="RegressTestObj*"/>
-             </parameter>
-           </parameters>
-@@ -5313,7 +5301,7 @@ the introspection client langage.</doc>
-       </field>
-       <field name="_regress_reserved1" introspectable="0">
-         <callback name="_regress_reserved1">
--          <source-position filename="regress.h" line="827"/>
-+          <source-position filename="regress.h" line="825"/>
-           <return-value transfer-ownership="none">
-             <type name="none" c:type="void"/>
-           </return-value>
-@@ -5321,7 +5309,7 @@ the introspection client langage.</doc>
-       </field>
-       <field name="_regress_reserved2" introspectable="0">
-         <callback name="_regress_reserved2">
--          <source-position filename="regress.h" line="828"/>
-+          <source-position filename="regress.h" line="826"/>
-           <return-value transfer-ownership="none">
-             <type name="none" c:type="void"/>
-           </return-value>
-@@ -5359,7 +5347,7 @@ the introspection client langage.</doc>
-       </function>
-     </enumeration>
-     <bitfield name="TestPrivateEnum" c:type="RegressTestPrivateEnum">
--      <source-position filename="regress.h" line="1487"/>
-+      <source-position filename="regress.h" line="1485"/>
-       <member name="public_enum_before"
-               value="1"
-               c:identifier="REGRESS_TEST_PUBLIC_ENUM_BEFORE">
-@@ -5370,7 +5358,7 @@ the introspection client langage.</doc>
-       </member>
-     </bitfield>
-     <record name="TestPrivateStruct" c:type="RegressTestPrivateStruct">
--      <source-position filename="regress.h" line="1479"/>
-+      <source-position filename="regress.h" line="1477"/>
-       <field name="this_is_public_before" writable="1">
-         <type name="gint" c:type="gint"/>
-       </field>
-@@ -5382,7 +5370,7 @@ the introspection client langage.</doc>
-       </field>
-     </record>
-     <record name="TestReferenceCounters" c:type="RegressTestReferenceCounters">
--      <source-position filename="regress.h" line="1589"/>
-+      <source-position filename="regress.h" line="1587"/>
-       <field name="refcount" writable="1">
-         <type name="gint" c:type="grefcount"/>
-       </field>
-@@ -5411,8 +5399,8 @@ the introspection client langage.</doc>
-             glib:type-name="RegressTestSimpleBoxedA"
-             glib:get-type="regress_test_simple_boxed_a_get_gtype"
-             c:symbol-prefix="test_simple_boxed_a">
--      <doc xml:space="preserve" filename="regress.h" line="628">...</doc>
--      <source-position filename="regress.h" line="643"/>
-+      <doc xml:space="preserve" filename="regress.h" line="626">...</doc>
-+      <source-position filename="regress.h" line="641"/>
-       <field name="some_int" writable="1">
-         <type name="gint" c:type="gint"/>
-       </field>
-@@ -5426,7 +5414,7 @@ the introspection client langage.</doc>
-         <type name="TestEnum" c:type="RegressTestEnum"/>
-       </field>
-       <method name="copy" c:identifier="regress_test_simple_boxed_a_copy">
--        <source-position filename="regress.h" line="650"/>
-+        <source-position filename="regress.h" line="648"/>
-         <return-value transfer-ownership="full">
-           <type name="TestSimpleBoxedA" c:type="RegressTestSimpleBoxedA*"/>
-         </return-value>
-@@ -5437,7 +5425,7 @@ the introspection client langage.</doc>
-         </parameters>
-       </method>
-       <method name="equals" c:identifier="regress_test_simple_boxed_a_equals">
--        <source-position filename="regress.h" line="653"/>
-+        <source-position filename="regress.h" line="651"/>
-         <return-value transfer-ownership="none">
-           <type name="gboolean" c:type="gboolean"/>
-         </return-value>
-@@ -5452,7 +5440,7 @@ the introspection client langage.</doc>
-       </method>
-       <function name="const_return"
-                 c:identifier="regress_test_simple_boxed_a_const_return">
--        <source-position filename="regress.h" line="657"/>
-+        <source-position filename="regress.h" line="655"/>
-         <return-value transfer-ownership="none">
-           <type name="TestSimpleBoxedA"
-                 c:type="const RegressTestSimpleBoxedA*"/>
-@@ -5464,7 +5452,7 @@ the introspection client langage.</doc>
-             glib:type-name="RegressTestSimpleBoxedB"
-             glib:get-type="regress_test_simple_boxed_b_get_type"
-             c:symbol-prefix="test_simple_boxed_b">
--      <source-position filename="regress.h" line="664"/>
-+      <source-position filename="regress.h" line="662"/>
-       <field name="some_int8" writable="1">
-         <type name="gint8" c:type="gint8"/>
-       </field>
-@@ -5472,7 +5460,7 @@ the introspection client langage.</doc>
-         <type name="TestSimpleBoxedA" c:type="RegressTestSimpleBoxedA"/>
-       </field>
-       <method name="copy" c:identifier="regress_test_simple_boxed_b_copy">
--        <source-position filename="regress.h" line="671"/>
-+        <source-position filename="regress.h" line="669"/>
-         <return-value transfer-ownership="full">
-           <type name="TestSimpleBoxedB" c:type="RegressTestSimpleBoxedB*"/>
-         </return-value>
-@@ -5484,13 +5472,13 @@ the introspection client langage.</doc>
-       </method>
-     </record>
-     <callback name="TestSimpleCallback" c:type="RegressTestSimpleCallback">
--      <source-position filename="regress.h" line="1158"/>
-+      <source-position filename="regress.h" line="1156"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-     </callback>
-     <record name="TestStructA" c:type="RegressTestStructA">
--      <source-position filename="regress.h" line="546"/>
-+      <source-position filename="regress.h" line="544"/>
-       <field name="some_int" writable="1">
-         <type name="gint" c:type="gint"/>
-       </field>
-@@ -5507,7 +5495,7 @@ the introspection client langage.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="1736">Make a copy of a RegressTestStructA</doc>
--        <source-position filename="regress.h" line="549"/>
-+        <source-position filename="regress.h" line="547"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -5530,7 +5518,7 @@ the introspection client langage.</doc>
-         </parameters>
-       </method>
-       <function name="parse" c:identifier="regress_test_struct_a_parse">
--        <source-position filename="regress.h" line="553"/>
-+        <source-position filename="regress.h" line="551"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -5554,7 +5542,7 @@ the introspection client langage.</doc>
-       </function>
-     </record>
-     <record name="TestStructB" c:type="RegressTestStructB">
--      <source-position filename="regress.h" line="562"/>
-+      <source-position filename="regress.h" line="560"/>
-       <field name="some_int8" writable="1">
-         <type name="gint8" c:type="gint8"/>
-       </field>
-@@ -5565,7 +5553,7 @@ the introspection client langage.</doc>
-         <doc xml:space="preserve"
-              filename="regress.c"
-              line="1779">Make a copy of a RegressTestStructB</doc>
--        <source-position filename="regress.h" line="565"/>
-+        <source-position filename="regress.h" line="563"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -5589,7 +5577,7 @@ the introspection client langage.</doc>
-       </method>
-     </record>
-     <record name="TestStructC" c:type="RegressTestStructC">
--      <source-position filename="regress.h" line="573"/>
-+      <source-position filename="regress.h" line="571"/>
-       <field name="another_int" writable="1">
-         <type name="gint" c:type="gint"/>
-       </field>
-@@ -5598,7 +5586,7 @@ the introspection client langage.</doc>
-       </field>
-     </record>
-     <record name="TestStructD" c:type="RegressTestStructD">
--      <source-position filename="regress.h" line="592"/>
-+      <source-position filename="regress.h" line="590"/>
-       <field name="array1" writable="1">
-         <array c:type="RegressTestStructA**">
-           <type name="TestStructA" c:type="RegressTestStructA*"/>
-@@ -5624,7 +5612,7 @@ the introspection client langage.</doc>
-       </field>
-     </record>
-     <record name="TestStructE" c:type="RegressTestStructE">
--      <source-position filename="regress.h" line="609"/>
-+      <source-position filename="regress.h" line="607"/>
-       <field name="some_type" writable="1">
-         <type name="GType" c:type="GType"/>
-       </field>
-@@ -5664,7 +5652,7 @@ the introspection client langage.</doc>
-       </field>
-     </union>
-     <record name="TestStructF" c:type="RegressTestStructF">
--      <source-position filename="regress.h" line="622"/>
-+      <source-position filename="regress.h" line="620"/>
-       <field name="ref_count" writable="1">
-         <type name="gint" c:type="volatile gint"/>
-       </field>
-@@ -5691,7 +5679,7 @@ the introspection client langage.</doc>
-       </field>
-     </record>
-     <record name="TestStructFixedArray" c:type="RegressTestStructFixedArray">
--      <source-position filename="regress.h" line="1492"/>
-+      <source-position filename="regress.h" line="1490"/>
-       <field name="just_int" writable="1">
-         <type name="gint" c:type="gint"/>
-       </field>
-@@ -5701,7 +5689,7 @@ the introspection client langage.</doc>
-         </array>
-       </field>
-       <method name="frob" c:identifier="regress_test_struct_fixed_array_frob">
--        <source-position filename="regress.h" line="1496"/>
-+        <source-position filename="regress.h" line="1494"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -5720,17 +5708,17 @@ the introspection client langage.</doc>
-            glib:type-name="RegressTestSubObj"
-            glib:get-type="regress_test_sub_obj_get_type"
-            glib:type-struct="TestSubObjClass">
--      <source-position filename="regress.h" line="1016"/>
-+      <source-position filename="regress.h" line="1014"/>
-       <implements name="TestInterface"/>
-       <constructor name="new" c:identifier="regress_test_sub_obj_new">
--        <source-position filename="regress.h" line="1023"/>
-+        <source-position filename="regress.h" line="1021"/>
-         <return-value transfer-ownership="full">
-           <type name="TestObj" c:type="RegressTestObj*"/>
-         </return-value>
-       </constructor>
-       <method name="instance_method"
-               c:identifier="regress_test_sub_obj_instance_method">
--        <source-position filename="regress.h" line="1029"/>
-+        <source-position filename="regress.h" line="1027"/>
-         <return-value transfer-ownership="none">
-           <type name="gint" c:type="int"/>
-         </return-value>
-@@ -5741,7 +5729,7 @@ the introspection client langage.</doc>
-         </parameters>
-       </method>
-       <method name="unset_bare" c:identifier="regress_test_sub_obj_unset_bare">
--        <source-position filename="regress.h" line="1026"/>
-+        <source-position filename="regress.h" line="1024"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -5771,7 +5759,7 @@ the introspection client langage.</doc>
-     <record name="TestSubObjClass"
-             c:type="RegressTestSubObjClass"
-             glib:is-gtype-struct-for="TestSubObj">
--      <source-position filename="regress.h" line="1016"/>
-+      <source-position filename="regress.h" line="1014"/>
-       <field name="parent_class">
-         <type name="TestObjClass" c:type="RegressTestObjClass"/>
-       </field>
-@@ -5783,16 +5771,16 @@ the introspection client langage.</doc>
-            glib:type-name="RegressTestWi8021x"
-            glib:get-type="regress_test_wi_802_1x_get_type"
-            glib:type-struct="TestWi8021xClass">
--      <source-position filename="regress.h" line="1312"/>
-+      <source-position filename="regress.h" line="1310"/>
-       <constructor name="new" c:identifier="regress_test_wi_802_1x_new">
--        <source-position filename="regress.h" line="1319"/>
-+        <source-position filename="regress.h" line="1317"/>
-         <return-value transfer-ownership="full">
-           <type name="TestWi8021x" c:type="RegressTestWi8021x*"/>
-         </return-value>
-       </constructor>
-       <function name="static_method"
-                 c:identifier="regress_test_wi_802_1x_static_method">
--        <source-position filename="regress.h" line="1328"/>
-+        <source-position filename="regress.h" line="1326"/>
-         <return-value transfer-ownership="none">
-           <type name="gint" c:type="int"/>
-         </return-value>
-@@ -5805,7 +5793,7 @@ the introspection client langage.</doc>
-       <method name="get_testbool"
-               c:identifier="regress_test_wi_802_1x_get_testbool"
-               glib:get-property="testbool">
--        <source-position filename="regress.h" line="1322"/>
-+        <source-position filename="regress.h" line="1320"/>
-         <return-value transfer-ownership="none">
-           <type name="gboolean" c:type="gboolean"/>
-         </return-value>
-@@ -5818,7 +5806,7 @@ the introspection client langage.</doc>
-       <method name="set_testbool"
-               c:identifier="regress_test_wi_802_1x_set_testbool"
-               glib:set-property="testbool">
--        <source-position filename="regress.h" line="1325"/>
-+        <source-position filename="regress.h" line="1323"/>
-         <return-value transfer-ownership="none">
-           <type name="none" c:type="void"/>
-         </return-value>
-@@ -5849,7 +5837,7 @@ the introspection client langage.</doc>
-     <record name="TestWi8021xClass"
-             c:type="RegressTestWi8021xClass"
-             glib:is-gtype-struct-for="TestWi8021x">
--      <source-position filename="regress.h" line="1312"/>
-+      <source-position filename="regress.h" line="1310"/>
-       <field name="parent_class">
-         <type name="GObject.ObjectClass" c:type="GObjectClass"/>
-       </field>
-@@ -5857,12 +5845,12 @@ the introspection client langage.</doc>
-     <constant name="UTF8_CONSTANT"
-               value="const ♥ utf8"
-               c:type="REGRESS_UTF8_CONSTANT">
--      <source-position filename="regress.h" line="1507"/>
-+      <source-position filename="regress.h" line="1505"/>
-       <type name="utf8" c:type="gchar*"/>
-     </constant>
-     <function name="aliased_caller_alloc"
-               c:identifier="regress_aliased_caller_alloc">
--      <source-position filename="regress.h" line="1469"/>
-+      <source-position filename="regress.h" line="1467"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6519,7 +6507,7 @@ exposed to language bindings.</doc>
-       </parameters>
-     </function>
-     <function name="func_obj_null_in" c:identifier="regress_func_obj_null_in">
--      <source-position filename="regress.h" line="979"/>
-+      <source-position filename="regress.h" line="977"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6537,7 +6525,7 @@ exposed to language bindings.</doc>
-     </function>
-     <function name="func_obj_nullable_in"
-               c:identifier="regress_func_obj_nullable_in">
--      <source-position filename="regress.h" line="984"/>
-+      <source-position filename="regress.h" line="982"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6554,7 +6542,7 @@ exposed to language bindings.</doc>
-       </parameters>
-     </function>
-     <function name="get_variant" c:identifier="regress_get_variant">
--      <source-position filename="regress.h" line="1582"/>
-+      <source-position filename="regress.h" line="1580"/>
-       <return-value transfer-ownership="none">
-         <doc xml:space="preserve"
-              filename="regress.c"
-@@ -6586,7 +6574,7 @@ exposed to language bindings.</doc>
-            filename="regress.c"
-            line="4701">This test case mirrors GnomeKeyringPasswordSchema from
- libgnome-keyring.</doc>
--      <source-position filename="regress.h" line="1522"/>
-+      <source-position filename="regress.h" line="1520"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6609,7 +6597,7 @@ libgnome-keyring.</doc>
-     </function>
-     <function name="introspectable_via_alias"
-               c:identifier="regress_introspectable_via_alias">
--      <source-position filename="regress.h" line="1447"/>
-+      <source-position filename="regress.h" line="1445"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6622,7 +6610,7 @@ libgnome-keyring.</doc>
-     <function name="not_introspectable_via_alias"
-               c:identifier="regress_not_introspectable_via_alias"
-               introspectable="0">
--      <source-position filename="regress.h" line="1458"/>
-+      <source-position filename="regress.h" line="1456"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6635,7 +6623,7 @@ libgnome-keyring.</doc>
-     <function name="random_function_with_skipped_structure"
-               c:identifier="regress_random_function_with_skipped_structure"
-               introspectable="0">
--      <source-position filename="regress.h" line="1418"/>
-+      <source-position filename="regress.h" line="1416"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6678,7 +6666,7 @@ in particular, but it should be serialized in the gir nevertheless.</doc>
-     </function>
-     <function name="test_array_callback"
-               c:identifier="regress_test_array_callback">
--      <source-position filename="regress.h" line="1213"/>
-+      <source-position filename="regress.h" line="1211"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -6690,7 +6678,7 @@ in particular, but it should be serialized in the gir nevertheless.</doc>
-     </function>
-     <function name="test_array_fixed_out_objects"
-               c:identifier="regress_test_array_fixed_out_objects">
--      <source-position filename="regress.h" line="890"/>
-+      <source-position filename="regress.h" line="888"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -6865,7 +6853,7 @@ in particular, but it should be serialized in the gir nevertheless.</doc>
-     </function>
-     <function name="test_array_inout_callback"
-               c:identifier="regress_test_array_inout_callback">
--      <source-position filename="regress.h" line="1216"/>
-+      <source-position filename="regress.h" line="1214"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -7053,7 +7041,7 @@ in particular, but it should be serialized in the gir nevertheless.</doc>
-     </function>
-     <function name="test_array_static_in_int"
-               c:identifier="regress_test_array_static_in_int">
--      <source-position filename="regress.h" line="898"/>
-+      <source-position filename="regress.h" line="896"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7077,7 +7065,7 @@ in particular, but it should be serialized in the gir nevertheless.</doc>
- Similar to:
- - gsf_property_settings_free() with structs but they contain pointers
- - g_byte_array_new_take() with guint8s</doc>
--      <source-position filename="regress.h" line="1604"/>
-+      <source-position filename="regress.h" line="1602"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7105,7 +7093,7 @@ Similar to:
-            line="4853">Test flat array input with transfer none.
- 
- Similar to g_main_context_check() or gtk_target_list_new().</doc>
--      <source-position filename="regress.h" line="1607"/>
-+      <source-position filename="regress.h" line="1605"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7131,7 +7119,7 @@ Similar to g_main_context_check() or gtk_target_list_new().</doc>
-       <doc xml:space="preserve"
-            filename="regress.c"
-            line="1762">This is similar to gdk_keymap_get_entries_for_keyval().</doc>
--      <source-position filename="regress.h" line="556"/>
-+      <source-position filename="regress.h" line="554"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7159,7 +7147,7 @@ Similar to g_main_context_check() or gtk_target_list_new().</doc>
-            line="4812">Test flat caller-allocated array output.
- 
- Similar to g_main_context_query().</doc>
--      <source-position filename="regress.h" line="1601"/>
-+      <source-position filename="regress.h" line="1599"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7193,7 +7181,7 @@ Similar to g_main_context_query().</doc>
-            line="4774">Test flat array output with transfer container.
- 
- Similar to pango_layout_get_log_attrs().</doc>
--      <source-position filename="regress.h" line="1595"/>
-+      <source-position filename="regress.h" line="1593"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7225,7 +7213,7 @@ Similar to pango_layout_get_log_attrs().</doc>
-       <doc xml:space="preserve"
-            filename="regress.c"
-            line="4796">Test flat fixed-size array output with transfer full.</doc>
--      <source-position filename="regress.h" line="1598"/>
-+      <source-position filename="regress.h" line="1596"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7255,7 +7243,7 @@ Similar to:
- - mm_modem_peek_ports() with structs
- - gdk_query_visual_types() with enums
- - gdk_event_get_axes() with doubles</doc>
--      <source-position filename="regress.h" line="1592"/>
-+      <source-position filename="regress.h" line="1590"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7284,7 +7272,7 @@ Similar to:
-     </function>
-     <function name="test_async_ready_callback"
-               c:identifier="regress_test_async_ready_callback">
--      <source-position filename="regress.h" line="1246"/>
-+      <source-position filename="regress.h" line="1244"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7335,7 +7323,7 @@ Similar to:
-     </function>
-     <function name="test_boxeds_not_a_method"
-               c:identifier="regress_test_boxeds_not_a_method">
--      <source-position filename="regress.h" line="712"/>
-+      <source-position filename="regress.h" line="710"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7347,7 +7335,7 @@ Similar to:
-     </function>
-     <function name="test_boxeds_not_a_static"
-               c:identifier="regress_test_boxeds_not_a_static">
--      <source-position filename="regress.h" line="715"/>
-+      <source-position filename="regress.h" line="713"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7413,7 +7401,7 @@ Similar to:
-       </return-value>
-     </function>
-     <function name="test_callback" c:identifier="regress_test_callback">
--      <source-position filename="regress.h" line="1207"/>
-+      <source-position filename="regress.h" line="1205"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -7429,7 +7417,7 @@ Similar to:
-     </function>
-     <function name="test_callback_async"
-               c:identifier="regress_test_callback_async">
--      <source-position filename="regress.h" line="1239"/>
-+      <source-position filename="regress.h" line="1237"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7455,7 +7443,7 @@ Similar to:
-            filename="regress.c"
-            line="4055">Notified - callback persists until a DestroyNotify delegate
- is invoked.</doc>
--      <source-position filename="regress.h" line="1226"/>
-+      <source-position filename="regress.h" line="1224"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -7485,7 +7473,7 @@ is invoked.</doc>
-            filename="regress.c"
-            line="4082">Adds a scope notified callback with no user data. This can invoke an error
- condition in bindings which needs to be tested.</doc>
--      <source-position filename="regress.h" line="1231"/>
-+      <source-position filename="regress.h" line="1229"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -7504,7 +7492,7 @@ condition in bindings which needs to be tested.</doc>
-     </function>
-     <function name="test_callback_return_full"
-               c:identifier="regress_test_callback_return_full">
--      <source-position filename="regress.h" line="1223"/>
-+      <source-position filename="regress.h" line="1221"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -7517,7 +7505,7 @@ condition in bindings which needs to be tested.</doc>
-     </function>
-     <function name="test_callback_thaw_async"
-               c:identifier="regress_test_callback_thaw_async">
--      <source-position filename="regress.h" line="1242"/>
-+      <source-position filename="regress.h" line="1240"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -7529,7 +7517,7 @@ condition in bindings which needs to be tested.</doc>
-            line="4096">Invokes all callbacks installed by #test_callback_destroy_notify(),
- adding up their return values, and removes them, invoking the
- corresponding destroy notfications.</doc>
--      <source-position filename="regress.h" line="1235"/>
-+      <source-position filename="regress.h" line="1233"/>
-       <return-value transfer-ownership="none">
-         <doc xml:space="preserve"
-              filename="regress.c"
-@@ -7543,7 +7531,7 @@ corresponding destroy notfications.</doc>
-            filename="regress.c"
-            line="4024">Call - callback parameter persists for the duration of the method
- call and can be released on return.</doc>
--      <source-position filename="regress.h" line="1219"/>
-+      <source-position filename="regress.h" line="1217"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -7615,7 +7603,7 @@ call and can be released on return.</doc>
-     </function>
-     <function name="test_create_fundamental_hidden_class_instance"
-               c:identifier="regress_test_create_fundamental_hidden_class_instance">
--      <source-position filename="regress.h" line="1139"/>
-+      <source-position filename="regress.h" line="1137"/>
-       <return-value transfer-ownership="full">
-         <type name="TestFundamentalObject"
-               c:type="RegressTestFundamentalObject*"/>
-@@ -7623,7 +7611,7 @@ call and can be released on return.</doc>
-     </function>
-     <function name="test_date_in_gvalue"
-               c:identifier="regress_test_date_in_gvalue">
--      <source-position filename="regress.h" line="1385"/>
-+      <source-position filename="regress.h" line="1383"/>
-       <return-value transfer-ownership="full">
-         <type name="GObject.Value" c:type="GValue*"/>
-       </return-value>
-@@ -7708,7 +7696,7 @@ call and can be released on return.</doc>
-     </function>
-     <function name="test_gerror_callback"
-               c:identifier="regress_test_gerror_callback">
--      <source-position filename="regress.h" line="1264"/>
-+      <source-position filename="regress.h" line="1262"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8171,7 +8159,7 @@ element-type annotation.</doc>
-     </function>
-     <function name="test_hash_table_callback"
-               c:identifier="regress_test_hash_table_callback">
--      <source-position filename="regress.h" line="1261"/>
-+      <source-position filename="regress.h" line="1259"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8289,7 +8277,7 @@ element-type annotation.</doc>
-     </function>
-     <function name="test_multi_callback"
-               c:identifier="regress_test_multi_callback">
--      <source-position filename="regress.h" line="1210"/>
-+      <source-position filename="regress.h" line="1208"/>
-       <return-value transfer-ownership="none">
-         <type name="gint" c:type="int"/>
-       </return-value>
-@@ -8338,7 +8326,7 @@ It has multiple lines in the documentation.
- The sky is blue.
- 
- You will give me your credit card number.</doc>
--      <source-position filename="regress.h" line="1399"/>
-+      <source-position filename="regress.h" line="1397"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8375,7 +8363,7 @@ rgb(20%, 30%, 0%)&lt;/literallayout&gt;&lt;/entry&gt;
- &lt;/informaltable&gt;
- 
- What we're testing here is that the scanner ignores the @a nested inside XML.</doc>
--      <source-position filename="regress.h" line="1402"/>
-+      <source-position filename="regress.h" line="1400"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8390,7 +8378,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d
-     </function>
-     <function name="test_noptr_callback"
-               c:identifier="regress_test_noptr_callback">
--      <source-position filename="regress.h" line="1204"/>
-+      <source-position filename="regress.h" line="1202"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8406,7 +8394,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d
-     </function>
-     <function name="test_null_gerror_callback"
-               c:identifier="regress_test_null_gerror_callback">
--      <source-position filename="regress.h" line="1267"/>
-+      <source-position filename="regress.h" line="1265"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8418,14 +8406,14 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d
-     </function>
-     <function name="test_null_strv_in_gvalue"
-               c:identifier="regress_test_null_strv_in_gvalue">
--      <source-position filename="regress.h" line="1391"/>
-+      <source-position filename="regress.h" line="1389"/>
-       <return-value transfer-ownership="full">
-         <type name="GObject.Value" c:type="GValue*"/>
-       </return-value>
-     </function>
-     <function name="test_owned_gerror_callback"
-               c:identifier="regress_test_owned_gerror_callback">
--      <source-position filename="regress.h" line="1270"/>
-+      <source-position filename="regress.h" line="1268"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8464,14 +8452,14 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d
-     <function name="test_simple_boxed_a_const_return"
-               c:identifier="regress_test_simple_boxed_a_const_return"
-               moved-to="TestSimpleBoxedA.const_return">
--      <source-position filename="regress.h" line="657"/>
-+      <source-position filename="regress.h" line="655"/>
-       <return-value transfer-ownership="none">
-         <type name="TestSimpleBoxedA" c:type="const RegressTestSimpleBoxedA*"/>
-       </return-value>
-     </function>
-     <function name="test_simple_callback"
-               c:identifier="regress_test_simple_callback">
--      <source-position filename="regress.h" line="1201"/>
-+      <source-position filename="regress.h" line="1199"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8503,7 +8491,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML.</d
-            filename="regress.c"
-            line="4277">Should not emit a warning:
- https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
--      <source-position filename="regress.h" line="1274"/>
-+      <source-position filename="regress.h" line="1272"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8530,7 +8518,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
-     <function name="test_struct_a_parse"
-               c:identifier="regress_test_struct_a_parse"
-               moved-to="TestStructA.parse">
--      <source-position filename="regress.h" line="553"/>
-+      <source-position filename="regress.h" line="551"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8567,7 +8555,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
-     </function>
-     <function name="test_strv_in_gvalue"
-               c:identifier="regress_test_strv_in_gvalue">
--      <source-position filename="regress.h" line="1388"/>
-+      <source-position filename="regress.h" line="1386"/>
-       <return-value transfer-ownership="full">
-         <type name="GObject.Value" c:type="GValue*"/>
-       </return-value>
-@@ -8626,7 +8614,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
-     </function>
-     <function name="test_torture_signature_0"
-               c:identifier="regress_test_torture_signature_0">
--      <source-position filename="regress.h" line="1356"/>
-+      <source-position filename="regress.h" line="1354"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -8666,7 +8654,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
-       <doc xml:space="preserve"
-            filename="regress.c"
-            line="4497">This function throws an error if m is odd.</doc>
--      <source-position filename="regress.h" line="1364"/>
-+      <source-position filename="regress.h" line="1362"/>
-       <return-value transfer-ownership="none">
-         <type name="gboolean" c:type="gboolean"/>
-       </return-value>
-@@ -8702,7 +8690,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
-     </function>
-     <function name="test_torture_signature_2"
-               c:identifier="regress_test_torture_signature_2">
--      <source-position filename="regress.h" line="1373"/>
-+      <source-position filename="regress.h" line="1371"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-@@ -9003,7 +8991,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
-     <function name="test_value_get_fundamental_object"
-               c:identifier="regress_test_value_get_fundamental_object"
-               introspectable="0">
--      <source-position filename="regress.h" line="1079"/>
-+      <source-position filename="regress.h" line="1077"/>
-       <return-value>
-         <type name="TestFundamentalObject"
-               c:type="RegressTestFundamentalObject*"/>
-@@ -9035,7 +9023,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
-     <function name="test_value_set_fundamental_object"
-               c:identifier="regress_test_value_set_fundamental_object"
-               introspectable="0">
--      <source-position filename="regress.h" line="1076"/>
-+      <source-position filename="regress.h" line="1074"/>
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
-       </return-value>
-diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
-index 962708b..edecc60 100644
---- a/tests/scanner/regress.h
-+++ b/tests/scanner/regress.h
-@@ -524,8 +524,6 @@ GQuark regress_atest_error_quark (void);
- #define REGRESS_BOOL_CONSTANT TRUE
- #define REGRESS_G_GINT64_CONSTANT (G_GINT64_CONSTANT (1000))
- #define REGRESS_GUINT64_CONSTANT ((guint64) -1)
--#define REGRESS_GOOD_EXPR_CONSTANT (1 + 2 * (3 + 2) << 3 - 4 >> REGRESS_ATEST_ERROR_CODE2)
--#define REGRESS_BAD_EXPR_CONSTANT (1 + SOMETHING_UNDEFINED)
- 
- typedef guint64 RegressTestTypeGUInt64;
- #define REGRESS_GUINT64_CONSTANTA ((RegressTestTypeGUInt64) -1)
diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index 891905f..be9b057 100644
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -1,15 +1,13 @@
-%global glib2_version 2.76.0
+%global glib2_version 2.78.0
 
 Name:           gobject-introspection
-Version:        1.76.1
-Release:        5%{?dist}
+Version:        1.78.1
+Release:        1%{?dist}
 Summary:        Introspection system for GObject-based libraries
 
 License:        GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause
 URL:            https://wiki.gnome.org/Projects/GObjectIntrospection
-Source0:        https://download.gnome.org/sources/%{name}/1.76/%{name}-%{version}.tar.xz
-# https://gitlab.gnome.org/GNOME/gobject-introspection/-/issues/458
-Patch0:         gobject-introspection-1.76.1-revert-failing-test.patch
+Source0:        https://download.gnome.org/sources/%{name}/1.78/%{name}-%{version}.tar.xz
 # Workaround for Python 3.12 compatibility
 # https://bugzilla.redhat.com/show_bug.cgi?id=2208966
 Patch1:         workaround.patch
@@ -95,6 +93,9 @@ mv giscanner/ast.py giscanner/gio_ast.py
 %{_mandir}/man1/g-ir-scanner.1*
 
 %changelog
+* Mon Sep 18 2023 Kalev Lember <klember@redhat.com> - 1.78.1-1
+- Update to 1.78.1
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.76.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index a026f9d..2254f38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gobject-introspection-1.76.1.tar.xz) = 84331a30f8854d2259609650c21aadd6363ea1417a75828bd395f8f4346da1c6d6550cff5f2c9f5f6fd6fbf2a9d27b5880c2ee1616fa905c5f362384d481a916
+SHA512 (gobject-introspection-1.78.1.tar.xz) = a3081882995a762645b04faa71082dbd523bee845519007e48b13235aad8a4cd4c74f0d042a6c17710125f945bd970e4b76e95a559274e294d595e04725a4e97