diff -Nru gobject-introspection-1.45.3/build/gen-cairo-gir.py gobject-introspection-1.46.0/build/gen-cairo-gir.py
--- gobject-introspection-1.45.3/build/gen-cairo-gir.py	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/gen-cairo-gir.py	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-#!/usr/bin/python
-#
-# Expand the bundled cairo-1.0.gir.in files
-# for use in Visual C++ builds of G-I
-#
-# Author: Fan, Chun-wei
-# Date: January 20, 2014
-#
-# (Adapted from setup.py in
-# $(glib_src_root)/build/win32/setup.py written by Shixin Zeng)
-
-import os
-import sys
-import re
-import string
-import subprocess
-import optparse
-
-def process_in(src, dest, vars):
-    RE_VARS = re.compile(r'%(\w+?)%')
-    with open(src, 'r') as s:
-        with open(dest, 'w') as d:
-            for i in s:
-                i = RE_VARS.sub(lambda x: str(vars[x.group(1)]), i)
-                d.write(i)
-
-def parent_dir(path):
-    if not os.path.isabs(path):
-        path = os.path.abspath(path)
-    if os.path.isfile(path):
-        path = os.path.dirname(path)
-    return os.path.split(path)[0]
-
-def setup_vars_cairo(src, dest, dllname):
-    vars = {}
-    vars['CAIRO_GIR_PACKAGE'] = 'cairo-gobject'
-    vars['CAIRO_SHARED_LIBRARY'] = '%s' % dllname
-    process_in (src, dest, vars)
-
-def main(argv):
-    parser = optparse.OptionParser()
-    parser.add_option('--dllname', dest='dllname', action='store', help='Full file name of the Cairo-GObject DLL for the Cairo Introspection File')
-    parser.add_option('--vsver', dest='vsver', action='store', help='Version of Visual Studio used, 9 or 2008 for VS 2008, 10 or 2010 for VS2010, 11 or 2012 for VS2012')
-    opt, args = parser.parse_args(argv)
-    if opt.dllname is None:
-        print ('dllname must be specified.  Please refer to %s -h for more information' % os.path.basename(__file__))
-        sys.exit()
-
-    # Get the srcroot and the path where the bundled .gir files reside in the package
-    srcroot = parent_dir(__file__)
-    preset_gir_path = os.path.join(srcroot, 'gir')
-
-    # Set up variables in cairo-1.0.gir.in to produce cairo-1.0.gir
-    setup_vars_cairo(os.path.join(preset_gir_path, 'cairo-1.0.gir.in'),
-                     os.path.join(preset_gir_path, 'cairo-1.0.gir'),
-                     opt.dllname)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff -Nru gobject-introspection-1.45.3/build/gen-win32-cairo-gir.py gobject-introspection-1.46.0/build/gen-win32-cairo-gir.py
--- gobject-introspection-1.45.3/build/gen-win32-cairo-gir.py	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/build/gen-win32-cairo-gir.py	2015-07-30 10:32:27.000000000 +0000
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+#
+# Expand the bundled cairo-1.0.gir.in files
+# for use in Visual C++ builds of G-I
+#
+# Author: Fan, Chun-wei
+# Date: January 20, 2014
+#
+# (Adapted from setup.py in
+# $(glib_src_root)/build/win32/setup.py written by Shixin Zeng)
+
+import os
+import sys
+import optparse
+
+from gi_msvc_build_utils import process_in
+from gi_msvc_build_utils import parent_dir
+
+def setup_vars_cairo(src, dest, dllname):
+    vars = {}
+    vars['CAIRO_GIR_PACKAGE'] = 'cairo-gobject'
+    vars['CAIRO_SHARED_LIBRARY'] = '%s' % dllname
+    process_in (src, dest, vars, 1)
+
+def main(argv):
+    parser = optparse.OptionParser()
+    parser.add_option('--dllname', dest='dllname', action='store', help='Full file name of the Cairo-GObject DLL for the Cairo Introspection File')
+    opt, args = parser.parse_args(argv)
+    if opt.dllname is None:
+        print ('dllname must be specified.  Please refer to %s -h for more information' % os.path.basename(__file__))
+        sys.exit()
+
+    # Get the srcroot and the path where the bundled .gir files reside in the package
+    srcroot = parent_dir(__file__)
+    preset_gir_path = os.path.join(srcroot, 'gir')
+
+    # Set up variables in cairo-1.0.gir.in to produce cairo-1.0.gir
+    setup_vars_cairo(os.path.join(preset_gir_path, 'cairo-1.0.gir.in'),
+                     'cairo-1.0.gir',
+                     opt.dllname)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff -Nru gobject-introspection-1.45.3/build/gen-win32-g-ir-tools.py gobject-introspection-1.46.0/build/gen-win32-g-ir-tools.py
--- gobject-introspection-1.45.3/build/gen-win32-g-ir-tools.py	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/build/gen-win32-g-ir-tools.py	2015-07-30 10:32:27.000000000 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+#
+# Expand the bundled cairo-1.0.gir.in files
+# for use in Visual C++ builds of G-I
+#
+# Author: Fan, Chun-wei
+# Date: January 20, 2014
+#
+# (Adapted from setup.py in
+# $(glib_src_root)/build/win32/setup.py written by Shixin Zeng)
+
+import os
+import sys
+import optparse
+
+from gi_msvc_build_utils import process_in
+from gi_msvc_build_utils import parent_dir
+
+def setup_vars_tools(module, func, srcfile, outfile):
+    vars = {}
+
+    # Well, we are using the "relocatable" feature on Windows...
+    blah = 'this\\\\is\\\\ignored\\\\on\\\\windows'
+    vars['datarootdir'] = blah
+    vars['libdir'] = blah
+
+    # This doesn't really matter for cmd.exe usage, but
+    # let's just set this like this here, in case one
+    # wants to use MinGW with the scripts generated here
+    vars['PYTHON'] = 'python'
+
+    # The parts that really matter.
+    vars['TOOL_MODULE'] = module
+    vars['TOOL_FUNCTION'] = func
+    process_in(srcfile, outfile, vars, 2)
+
+def main(argv):
+    modules = ['scannermain','annotationmain','docmain']
+    funcs = ['scanner_main','annotation_main','doc_main']
+    tools = ['g-ir-scanner','g-ir-annotation-tool','g-ir-doc-tool']
+
+    srcroot = parent_dir(__file__)
+    preset_tools_path = os.path.join(srcroot, 'tools')
+    src = os.path.join(preset_tools_path, 'g-ir-tool-template.in')
+
+    for i in range(3):
+        dest = os.path.join(preset_tools_path, tools[i])
+        setup_vars_tools(modules[i], funcs[i], src, dest)
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))
diff -Nru gobject-introspection-1.45.3/build/gi-build-common-msvc.mak gobject-introspection-1.46.0/build/gi-build-common-msvc.mak
--- gobject-introspection-1.45.3/build/gi-build-common-msvc.mak	2014-07-09 18:00:28.000000000 +0000
+++ gobject-introspection-1.46.0/build/gi-build-common-msvc.mak	2015-07-30 10:32:27.000000000 +0000
@@ -15,11 +15,3 @@
 G_IR_SCANNER_CURRENT = ..\tools\g-ir-scanner
 G_IR_DOC_TOOL_CURRENT = ..\tools\g-ir-doc-tool
 G_IR_COMPILER_CURRENT = $(BINDIR)\g-ir-compiler.exe
-
-!if "$(VALID_GCC_INSTPATH)" == "TRUE"
-!if "$(PLAT)" == "x64"
-TIME_T_DEFINE = -Dtime_t=long long
-!else
-TIME_T_DEFINE = -Dtime_t=long
-!endif
-!endif
diff -Nru gobject-introspection-1.45.3/build/gi-introspection-msvc.mak gobject-introspection-1.46.0/build/gi-introspection-msvc.mak
--- gobject-introspection-1.45.3/build/gi-introspection-msvc.mak	2014-07-09 18:00:28.000000000 +0000
+++ gobject-introspection-1.46.0/build/gi-introspection-msvc.mak	2015-07-30 10:32:27.000000000 +0000
@@ -2,7 +2,13 @@
 
 # Change or pass in as a variable/env var if needed
 # The main DLLs that are used to build introspection files that are "installed"
-CAIROGOBJECT_DLLNAME= cairo-gobject-vs$(VSVER)
+!if "$(CAIROGOBJECT_DLLNAME)" == ""
+!if "$(USE_LIBTOOL_NAME)" == "1"
+CAIROGOBJECT_DLLNAME = libcairo-gobject-2.dll
+!else
+CAIROGOBJECT_DLLNAME = cairo-gobject-vs$(VSVER).dll
+!endif
+!endif
 
 # Please do not change anything after this line
 
@@ -44,7 +50,7 @@
 	GIRepository-$(GLIB_APIVERSION).typelib
 
 !if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildnev $(built_install_girs) $(built_install_typelibs) $(bundled_girs) $(bundled_typelibs)
+all: setgirbuildnev $(built_install_girs) $(built_install_typelibs) $(bundled_girs) $(bundled_typelibs) msg_cairo
 
 !include gi-setenv-msvc.mak
 
@@ -128,9 +134,8 @@
 
 # Bundled cairo-1.0.gir.in processing
 cairo-1.0.gir: ..\gir\cairo-1.0.gir.in
-	@-echo Generating and copying $@ from $*.gir.in...
-	@-if not exist ..\gir\$*.gir $(PYTHON2) gen-cairo-gir.py --dllname=$(CAIROGOBJECT_DLLNAME).dll
-	@-copy ..\gir\$*.gir $@
+	@-echo Generating $@ from $*.gir.in...
+	@-$(PYTHON2) gen-win32-cairo-gir.py --dllname=$(CAIROGOBJECT_DLLNAME)
 
 # Copy the .gir's bundled with G-I to this folder
 $(bundled_girs): ..\gir\win32-1.0.gir ..\gir\fontconfig-2.0.gir ..\gir\freetype2-2.0.gir ..\gir\GL-1.0.gir ..\gir\libxml2-2.0.gir
@@ -147,6 +152,20 @@
 	@-echo Compiling the bundled $*.gir that came with the GobjectIntrospection package...
 	@-$(G_IR_COMPILER_CURRENT) --includedir=. --debug --verbose $*.gir -o $@
 
+msg_cairo:
+	@-echo.
+	@-echo ************* Note ***********************************
+	@-echo The cairo-1.0.gir links to $(CAIROGOBJECT_DLLNAME),
+	@-echo please ensure that this is the correct DLL where the
+	@-echo cairo-gobject symbols can be loaded, which needs to
+	@-echo found when running programs or scripts that would
+	@-echo cairo-1.0.typelib.
+	@-echo.
+	@-echo If not, please clean the build and redo the build
+	@-echo specifying the correct DLL by passing in
+	@-echo CAIROGOBJECT_DLLNAME^=^<your DLL full filename^> when
+	@-echo invoking this NMake Makefile
+
 install-introspection: setgirbuildnev $(built_install_girs) $(built_install_typelibs) $(bundled_girs) cairo-1.0.gir $(bundled_typelibs)
 	@-mkdir $(G_IR_INCLUDEDIR)
 	@-mkdir $(G_IR_TYPELIBDIR)
@@ -164,7 +183,6 @@
 !endif
 
 clean:
-	@-del /f/q ..\gir\cairo-$(GI_APIVERSION).gir
 	@-del /f/q *.typelib
 	@-del /f/q *.gir
 	@-del /f/q gi_list
diff -Nru gobject-introspection-1.45.3/build/gi_msvc_build_utils.py gobject-introspection-1.46.0/build/gi_msvc_build_utils.py
--- gobject-introspection-1.45.3/build/gi_msvc_build_utils.py	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/build/gi_msvc_build_utils.py	2015-07-30 10:32:27.000000000 +0000
@@ -0,0 +1,20 @@
+import os
+import re
+
+def process_in(src, dest, vars, mode):
+    if mode == 1:
+        RE_VARS = re.compile(r'%(\w+?)%')
+    if mode == 2:
+        RE_VARS = re.compile(r'@(\w+?)@')
+    with open(src, 'r') as s:
+        with open(dest, 'w') as d:
+            for i in s:
+                i = RE_VARS.sub(lambda x: str(vars[x.group(1)]), i)
+                d.write(i)
+
+def parent_dir(path):
+    if not os.path.isabs(path):
+        path = os.path.abspath(path)
+    if os.path.isfile(path):
+        path = os.path.dirname(path)
+    return os.path.split(path)[0]
diff -Nru gobject-introspection-1.45.3/build/gi-setenv-msvc.mak gobject-introspection-1.46.0/build/gi-setenv-msvc.mak
--- gobject-introspection-1.45.3/build/gi-setenv-msvc.mak	2014-07-09 18:00:28.000000000 +0000
+++ gobject-introspection-1.46.0/build/gi-setenv-msvc.mak	2015-07-30 10:32:27.000000000 +0000
@@ -8,6 +8,6 @@
 	@set UNINSTALLED_INTROSPECTION_SRCDIR=..
 	@set UNINSTALLED_INTROSPECTION_BUILDDIR=..
 	@set PYTHONPATH=..;$(BINDIR)
-	@set PATH=$(BINDIR);$(BASEDIR)\bin;$(PATH);$(MINGWDIR)\bin
+	@set PATH=$(BINDIR);$(BASEDIR)\bin;$(PATH)
 	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
 	@set LIB=win32\vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(BASEDIR)\lib;$(LIB)
diff -Nru gobject-introspection-1.45.3/build/introspection-msvc.mak gobject-introspection-1.46.0/build/introspection-msvc.mak
--- gobject-introspection-1.45.3/build/introspection-msvc.mak	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/introspection-msvc.mak	2015-07-30 10:32:27.000000000 +0000
@@ -23,10 +23,8 @@
 
 # Don't change anything following this line!
 VALID_PKG_CONFIG_PATH = FALSE
-VALID_GCC_INSTPATH = FALSE
 
 MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
-MSG_INVALID_MINGWDIR = You must set or specifiy a valid MINGWDIR, where gcc.exe can be found in %MINGWDIR%\bin
 MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
 
 ERROR_MSG =
@@ -47,15 +45,7 @@
 VALID_PKG_CONFIG_PATH = FALSE
 !endif
 
-!if ![IF EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=TRUE > gcccheck.x]
-!endif
-
-!if ![IF NOT EXIST %MINGWDIR%\bin\gcc.exe @echo VALID_GCC_INSTPATH=FALSE > gcccheck.x]
-!endif
-
-!include gcccheck.x
-
-!if ![del $(ERRNUL) /q/f pkgconfig.chksize gcccheck.x]
+!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
 !endif
 
 VALID_CFGSET = FALSE
@@ -63,11 +53,6 @@
 VALID_CFGSET = TRUE
 !endif
 
-!if "$(VALID_GCC_INSTPATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_MINGWDIR)
-!endif
-
 !if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
 BUILD_INTROSPECTION = FALSE
 ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
diff -Nru gobject-introspection-1.45.3/build/Makefile.am gobject-introspection-1.46.0/build/Makefile.am
--- gobject-introspection-1.45.3/build/Makefile.am	2014-07-09 18:00:28.000000000 +0000
+++ gobject-introspection-1.46.0/build/Makefile.am	2015-07-30 10:32:27.000000000 +0000
@@ -1,10 +1,12 @@
 SUBDIRS = win32
 
 EXTRA_DIST =	\
-	detectenv_msvc.mak	\
-	gen-cairo-gir.py	\
-	gi-setenv-msvc.mak	\
-	gi-tests-msvc.mak	\
+	detectenv_msvc.mak		\
+	gen-win32-cairo-gir.py		\
+	gen-win32-g-ir-tools.py		\
 	gi-build-common-msvc.mak	\
 	gi-introspection-msvc.mak	\
+	gi_msvc_build_utils.py		\
+	gi-setenv-msvc.mak		\
+	gi-tests-msvc.mak		\
 	introspection-msvc.mak
diff -Nru gobject-introspection-1.45.3/build/Makefile.in gobject-introspection-1.46.0/build/Makefile.in
--- gobject-introspection-1.45.3/build/Makefile.in	2015-07-03 20:30:32.000000000 +0000
+++ gobject-introspection-1.46.0/build/Makefile.in	2015-09-22 11:24:38.000000000 +0000
@@ -362,12 +362,14 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = win32
 EXTRA_DIST = \
-	detectenv_msvc.mak	\
-	gen-cairo-gir.py	\
-	gi-setenv-msvc.mak	\
-	gi-tests-msvc.mak	\
+	detectenv_msvc.mak		\
+	gen-win32-cairo-gir.py		\
+	gen-win32-g-ir-tools.py		\
 	gi-build-common-msvc.mak	\
 	gi-introspection-msvc.mak	\
+	gi_msvc_build_utils.py		\
+	gi-setenv-msvc.mak		\
+	gi-tests-msvc.mak		\
 	introspection-msvc.mak
 
 all: all-recursive
diff -Nru gobject-introspection-1.45.3/build/win32/vs10/gi-extra-paths.props gobject-introspection-1.46.0/build/win32/vs10/gi-extra-paths.props
--- gobject-introspection-1.45.3/build/win32/vs10/gi-extra-paths.props	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs10/gi-extra-paths.props	2015-07-30 10:32:27.000000000 +0000
@@ -7,7 +7,7 @@
     <!-- PythonDir currently needs to point to a 32-bit/x86 Python 2.6/2.7 installation -->
     <PythonDir>c:\\python27</PythonDir>
     <!-- PythonDirX64 currently needs to point to an x86-64/x64 Python 2.6/2.7 installation -->
-    <PythonDirX64>c:\\python27.x64</PythonDirX64>
+    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>giextrapathsprops</_PropertySheetDisplayName>
diff -Nru gobject-introspection-1.45.3/build/win32/vs10/gi-gen-srcs.props gobject-introspection-1.46.0/build/win32/vs10/gi-gen-srcs.props
--- gobject-introspection-1.45.3/build/win32/vs10/gi-gen-srcs.props	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs10/gi-gen-srcs.props	2015-07-30 10:32:27.000000000 +0000
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
+    <Import Project="gi-extra-paths.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
-    <CopyGIRScanner>copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner</CopyGIRScanner>
-    <CopyGIRDocTool>copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool</CopyGIRDocTool>
-    <CopyGIRAnnotationTool>copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool</CopyGIRAnnotationTool>
-    <GenerateGIRDef>
-echo EXPORTS &gt; $(DefDir)\girepository.def
-cl -EP ..\..\..\girepository\girepository.symbols &gt;&gt; $(DefDir)\girepository.def
-    </GenerateGIRDef>
+    <GenToolsScripts>$(PythonDir)\python ..\..\..\build\gen-win32-g-ir-tools.py</GenToolsScripts>
+    <GenToolsScriptsX64>$(PythonDirX64)\python ..\..\..\build\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
@@ -20,17 +15,11 @@
     <BuildMacro Include="CopyConfigH">
       <Value>$(CopyConfigH)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRScanner">
-      <Value>$(CopyGIRScanner)</Value>
+    <BuildMacro Include="GenToolsScripts">
+      <Value>$(GenToolsScripts)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRDocTool">
-      <Value>$(CopyGIRDocTool)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyGIRAnnotationTool">
-      <Value>$(CopyGIRAnnotationTool)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGIRDef">
-      <Value>$(GenerateGIRDef)</Value>
+    <BuildMacro Include="GenToolsScriptsX64">
+      <Value>$(GenToolsScriptsX64)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff -Nru gobject-introspection-1.45.3/build/win32/vs10/gi-install.props gobject-introspection-1.46.0/build/win32/vs10/gi-install.props
--- gobject-introspection-1.45.3/build/win32/vs10/gi-install.props	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs10/gi-install.props	2015-09-22 11:27:24.000000000 +0000
@@ -65,6 +65,7 @@
 copy ..\..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
+copy ..\..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
diff -Nru gobject-introspection-1.45.3/build/win32/vs10/gi-prebuild.vcxproj gobject-introspection-1.46.0/build/win32/vs10/gi-prebuild.vcxproj
--- gobject-introspection-1.45.3/build/win32/vs10/gi-prebuild.vcxproj	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs10/gi-prebuild.vcxproj	2015-07-30 10:32:27.000000000 +0000
@@ -95,47 +95,19 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-scanner.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-doc-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-annotation-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+    <CustomBuild Include="..\..\..\tools\g-ir-tool-template.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff -Nru gobject-introspection-1.45.3/build/win32/vs10/girepository.vcxproj gobject-introspection-1.46.0/build/win32/vs10/girepository.vcxproj
--- gobject-introspection-1.45.3/build/win32/vs10/girepository.vcxproj	2015-07-03 20:31:08.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs10/girepository.vcxproj	2015-09-22 11:27:23.000000000 +0000
@@ -85,9 +85,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -111,9 +108,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -142,9 +136,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -171,9 +162,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
diff -Nru gobject-introspection-1.45.3/build/win32/vs10/girepository.vcxprojin gobject-introspection-1.46.0/build/win32/vs10/girepository.vcxprojin
--- gobject-introspection-1.45.3/build/win32/vs10/girepository.vcxprojin	2015-03-24 00:50:04.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs10/girepository.vcxprojin	2015-07-30 10:32:27.000000000 +0000
@@ -85,9 +85,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -111,9 +108,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -142,9 +136,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -171,9 +162,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
diff -Nru gobject-introspection-1.45.3/build/win32/vs10/README.txt gobject-introspection-1.46.0/build/win32/vs10/README.txt
--- gobject-introspection-1.45.3/build/win32/vs10/README.txt	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs10/README.txt	2015-07-30 10:32:27.000000000 +0000
@@ -48,19 +48,15 @@
 <root>\vs10\<PlatformName>\lib\.
 
 The libintl.h that is used for building GLib needs to be in
-<root>\vs10\<PlatformName>\include, if not already done so
-
-You will also need a working GCC/MinGW compiler installation
-in order to generate the .gir and .typelib files.  One may be
-obtained from the mingw or the mingw64 project.
+<root>\vs10\<PlatformName>\include, if not already done so.
 
 A working pkg-config tool is also required-it may be obtained from
 http://www.gtk.org/download/win32.php [32-bit]
 http://www.gtk.org/download/win64.php [64-bit]
 
 *** Note! ***
-Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH and
-MinGW, the build of G-I is now a 2-step process: one with the Visual Studio Projects that
+Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH,
+the build of G-I is now a 2-step process: one with the Visual Studio Projects that
 will build the libraries, tools, Python Module and test DLLs (except for the everything
 test), and the other one with NMake Makefiles for building the introspection files.
 Please note that if one needs to change the installation location
@@ -77,13 +73,6 @@
          You need to use an x64/amd64 version of Python for x64 builds, and a Win32/x86
          version of Python for Win32/x86 builds
 PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files.
-MINGWDIR: Root installation folder for your Windows GCC (such as MinGW).  For example,
-          if your gcc executable (gcc.exe) is in c:\mingw\bin, use "set MINGWDIR=c:\mingw"
-          You need to use an x64/amd64 version of gcc for x64 builds, and a Win32/x86
-          version of gcc for Win32/x86 builds
-
-GCC is currently needed to as the GCC preprocessor is used to create the introspection dump source
-file, which is then compiled with the Visual C++ compiler to produce the .gir files.
 
 Please see $(srcroot)\build\gi-introspection-msvc.mak for more details.  Doing
 "nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
diff -Nru gobject-introspection-1.45.3/build/win32/vs11/gi-extra-paths.props gobject-introspection-1.46.0/build/win32/vs11/gi-extra-paths.props
--- gobject-introspection-1.45.3/build/win32/vs11/gi-extra-paths.props	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs11/gi-extra-paths.props	2015-09-22 11:27:24.000000000 +0000
@@ -7,7 +7,7 @@
     <!-- PythonDir currently needs to point to a 32-bit/x86 Python 2.6/2.7 installation -->
     <PythonDir>c:\\python27</PythonDir>
     <!-- PythonDirX64 currently needs to point to an x86-64/x64 Python 2.6/2.7 installation -->
-    <PythonDirX64>c:\\python27.x64</PythonDirX64>
+    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>giextrapathsprops</_PropertySheetDisplayName>
diff -Nru gobject-introspection-1.45.3/build/win32/vs11/gi-gen-srcs.props gobject-introspection-1.46.0/build/win32/vs11/gi-gen-srcs.props
--- gobject-introspection-1.45.3/build/win32/vs11/gi-gen-srcs.props	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs11/gi-gen-srcs.props	2015-09-22 11:27:24.000000000 +0000
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
+    <Import Project="gi-extra-paths.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
-    <CopyGIRScanner>copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner</CopyGIRScanner>
-    <CopyGIRDocTool>copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool</CopyGIRDocTool>
-    <CopyGIRAnnotationTool>copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool</CopyGIRAnnotationTool>
-    <GenerateGIRDef>
-echo EXPORTS &gt; $(DefDir)\girepository.def
-cl -EP ..\..\..\girepository\girepository.symbols &gt;&gt; $(DefDir)\girepository.def
-    </GenerateGIRDef>
+    <GenToolsScripts>$(PythonDir)\python ..\..\..\build\gen-win32-g-ir-tools.py</GenToolsScripts>
+    <GenToolsScriptsX64>$(PythonDirX64)\python ..\..\..\build\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
@@ -20,17 +15,11 @@
     <BuildMacro Include="CopyConfigH">
       <Value>$(CopyConfigH)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRScanner">
-      <Value>$(CopyGIRScanner)</Value>
+    <BuildMacro Include="GenToolsScripts">
+      <Value>$(GenToolsScripts)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRDocTool">
-      <Value>$(CopyGIRDocTool)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyGIRAnnotationTool">
-      <Value>$(CopyGIRAnnotationTool)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGIRDef">
-      <Value>$(GenerateGIRDef)</Value>
+    <BuildMacro Include="GenToolsScriptsX64">
+      <Value>$(GenToolsScriptsX64)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff -Nru gobject-introspection-1.45.3/build/win32/vs11/gi-install.props gobject-introspection-1.46.0/build/win32/vs11/gi-install.props
--- gobject-introspection-1.45.3/build/win32/vs11/gi-install.props	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs11/gi-install.props	2015-09-22 11:27:24.000000000 +0000
@@ -65,6 +65,7 @@
 copy ..\..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
+copy ..\..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
diff -Nru gobject-introspection-1.45.3/build/win32/vs11/gi-prebuild.vcxproj gobject-introspection-1.46.0/build/win32/vs11/gi-prebuild.vcxproj
--- gobject-introspection-1.45.3/build/win32/vs11/gi-prebuild.vcxproj	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs11/gi-prebuild.vcxproj	2015-09-22 11:27:24.000000000 +0000
@@ -95,47 +95,19 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-scanner.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-doc-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-annotation-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+    <CustomBuild Include="..\..\..\tools\g-ir-tool-template.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff -Nru gobject-introspection-1.45.3/build/win32/vs11/girepository.vcxproj gobject-introspection-1.46.0/build/win32/vs11/girepository.vcxproj
--- gobject-introspection-1.45.3/build/win32/vs11/girepository.vcxproj	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs11/girepository.vcxproj	2015-09-22 11:27:24.000000000 +0000
@@ -85,9 +85,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -111,9 +108,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -142,9 +136,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -171,9 +162,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
diff -Nru gobject-introspection-1.45.3/build/win32/vs11/README.txt gobject-introspection-1.46.0/build/win32/vs11/README.txt
--- gobject-introspection-1.45.3/build/win32/vs11/README.txt	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs11/README.txt	2015-09-22 11:27:24.000000000 +0000
@@ -48,19 +48,15 @@
 <root>\vs11\<PlatformName>\lib\.
 
 The libintl.h that is used for building GLib needs to be in
-<root>\vs11\<PlatformName>\include, if not already done so
-
-You will also need a working GCC/MinGW compiler installation
-in order to generate the .gir and .typelib files.  One may be
-obtained from the mingw or the mingw64 project.
+<root>\vs11\<PlatformName>\include, if not already done so.
 
 A working pkg-config tool is also required-it may be obtained from
 http://www.gtk.org/download/win32.php [32-bit]
 http://www.gtk.org/download/win64.php [64-bit]
 
 *** Note! ***
-Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH and
-MinGW, the build of G-I is now a 2-step process: one with the Visual Studio Projects that
+Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH,
+the build of G-I is now a 2-step process: one with the Visual Studio Projects that
 will build the libraries, tools, Python Module and test DLLs (except for the everything
 test), and the other one with NMake Makefiles for building the introspection files.
 Please note that if one needs to change the installation location
@@ -77,13 +73,6 @@
          You need to use an x64/amd64 version of Python for x64 builds, and a Win32/x86
          version of Python for Win32/x86 builds
 PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files.
-MINGWDIR: Root installation folder for your Windows GCC (such as MinGW).  For example,
-          if your gcc executable (gcc.exe) is in c:\mingw\bin, use "set MINGWDIR=c:\mingw"
-          You need to use an x64/amd64 version of gcc for x64 builds, and a Win32/x86
-          version of gcc for Win32/x86 builds
-
-GCC is currently needed to as the GCC preprocessor is used to create the introspection dump source
-file, which is then compiled with the Visual C++ compiler to produce the .gir files.
 
 Please see $(srcroot)\build\gi-introspection-msvc.mak for more details.  Doing
 "nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
diff -Nru gobject-introspection-1.45.3/build/win32/vs12/gi-extra-paths.props gobject-introspection-1.46.0/build/win32/vs12/gi-extra-paths.props
--- gobject-introspection-1.45.3/build/win32/vs12/gi-extra-paths.props	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs12/gi-extra-paths.props	2015-09-22 11:27:24.000000000 +0000
@@ -7,7 +7,7 @@
     <!-- PythonDir currently needs to point to a 32-bit/x86 Python 2.6/2.7 installation -->
     <PythonDir>c:\\python27</PythonDir>
     <!-- PythonDirX64 currently needs to point to an x86-64/x64 Python 2.6/2.7 installation -->
-    <PythonDirX64>c:\\python27.x64</PythonDirX64>
+    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>giextrapathsprops</_PropertySheetDisplayName>
diff -Nru gobject-introspection-1.45.3/build/win32/vs12/gi-gen-srcs.props gobject-introspection-1.46.0/build/win32/vs12/gi-gen-srcs.props
--- gobject-introspection-1.45.3/build/win32/vs12/gi-gen-srcs.props	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs12/gi-gen-srcs.props	2015-09-22 11:27:24.000000000 +0000
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
+    <Import Project="gi-extra-paths.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
-    <CopyGIRScanner>copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner</CopyGIRScanner>
-    <CopyGIRDocTool>copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool</CopyGIRDocTool>
-    <CopyGIRAnnotationTool>copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool</CopyGIRAnnotationTool>
-    <GenerateGIRDef>
-echo EXPORTS &gt; $(DefDir)\girepository.def
-cl -EP ..\..\..\girepository\girepository.symbols &gt;&gt; $(DefDir)\girepository.def
-    </GenerateGIRDef>
+    <GenToolsScripts>$(PythonDir)\python ..\..\..\build\gen-win32-g-ir-tools.py</GenToolsScripts>
+    <GenToolsScriptsX64>$(PythonDirX64)\python ..\..\..\build\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
@@ -20,17 +15,11 @@
     <BuildMacro Include="CopyConfigH">
       <Value>$(CopyConfigH)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRScanner">
-      <Value>$(CopyGIRScanner)</Value>
+    <BuildMacro Include="GenToolsScripts">
+      <Value>$(GenToolsScripts)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRDocTool">
-      <Value>$(CopyGIRDocTool)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyGIRAnnotationTool">
-      <Value>$(CopyGIRAnnotationTool)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGIRDef">
-      <Value>$(GenerateGIRDef)</Value>
+    <BuildMacro Include="GenToolsScriptsX64">
+      <Value>$(GenToolsScriptsX64)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff -Nru gobject-introspection-1.45.3/build/win32/vs12/gi-install.props gobject-introspection-1.46.0/build/win32/vs12/gi-install.props
--- gobject-introspection-1.45.3/build/win32/vs12/gi-install.props	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs12/gi-install.props	2015-09-22 11:27:24.000000000 +0000
@@ -65,6 +65,7 @@
 copy ..\..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
+copy ..\..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
 copy ..\..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
diff -Nru gobject-introspection-1.45.3/build/win32/vs12/gi-prebuild.vcxproj gobject-introspection-1.46.0/build/win32/vs12/gi-prebuild.vcxproj
--- gobject-introspection-1.45.3/build/win32/vs12/gi-prebuild.vcxproj	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs12/gi-prebuild.vcxproj	2015-09-22 11:27:24.000000000 +0000
@@ -95,47 +95,19 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-scanner.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-doc-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-annotation-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+    <CustomBuild Include="..\..\..\tools\g-ir-tool-template.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff -Nru gobject-introspection-1.45.3/build/win32/vs12/girepository.vcxproj gobject-introspection-1.46.0/build/win32/vs12/girepository.vcxproj
--- gobject-introspection-1.45.3/build/win32/vs12/girepository.vcxproj	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs12/girepository.vcxproj	2015-09-22 11:27:24.000000000 +0000
@@ -85,9 +85,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -111,9 +108,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -142,9 +136,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
@@ -171,9 +162,6 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
     </ClCompile>
-    <PreLinkEvent>
-      <Command>$(GenerateGIRDef)</Command>
-    </PreLinkEvent>
     <Link>
       <AdditionalDependencies>libffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
diff -Nru gobject-introspection-1.45.3/build/win32/vs12/README.txt gobject-introspection-1.46.0/build/win32/vs12/README.txt
--- gobject-introspection-1.45.3/build/win32/vs12/README.txt	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs12/README.txt	2015-09-22 11:27:24.000000000 +0000
@@ -48,19 +48,15 @@
 <root>\vs12\<PlatformName>\lib\.
 
 The libintl.h that is used for building GLib needs to be in
-<root>\vs12\<PlatformName>\include, if not already done so
-
-You will also need a working GCC/MinGW compiler installation
-in order to generate the .gir and .typelib files.  One may be
-obtained from the mingw or the mingw64 project.
+<root>\vs12\<PlatformName>\include, if not already done so.
 
 A working pkg-config tool is also required-it may be obtained from
 http://www.gtk.org/download/win32.php [32-bit]
 http://www.gtk.org/download/win64.php [64-bit]
 
 *** Note! ***
-Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH and
-MinGW, the build of G-I is now a 2-step process: one with the Visual Studio Projects that
+Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH,
+the build of G-I is now a 2-step process: one with the Visual Studio Projects that
 will build the libraries, tools, Python Module and test DLLs (except for the everything
 test), and the other one with NMake Makefiles for building the introspection files.
 Please note that if one needs to change the installation location
@@ -77,13 +73,6 @@
          You need to use an x64/amd64 version of Python for x64 builds, and a Win32/x86
          version of Python for Win32/x86 builds
 PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files.
-MINGWDIR: Root installation folder for your Windows GCC (such as MinGW).  For example,
-          if your gcc executable (gcc.exe) is in c:\mingw\bin, use "set MINGWDIR=c:\mingw"
-          You need to use an x64/amd64 version of gcc for x64 builds, and a Win32/x86
-          version of gcc for Win32/x86 builds
-
-GCC is currently needed to as the GCC preprocessor is used to create the introspection dump source
-file, which is then compiled with the Visual C++ compiler to produce the .gir files.
 
 Please see $(srcroot)\build\gi-introspection-msvc.mak for more details.  Doing
 "nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
diff -Nru gobject-introspection-1.45.3/build/win32/vs9/gi-extra-paths.vsprops gobject-introspection-1.46.0/build/win32/vs9/gi-extra-paths.vsprops
--- gobject-introspection-1.45.3/build/win32/vs9/gi-extra-paths.vsprops	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs9/gi-extra-paths.vsprops	2015-07-30 10:32:27.000000000 +0000
@@ -13,6 +13,6 @@
 	<!-- PythonDirX64 currently needs to point to an x86-64/x64 Python 2.6/2.7 installation -->
 	<UserMacro
 		Name="PythonDirX64"
-		Value="c:\\python27.x64"
+		Value="$(PythonDir).x64"
 	/>
 </VisualStudioPropertySheet>
diff -Nru gobject-introspection-1.45.3/build/win32/vs9/gi-gen-srcs.vsprops gobject-introspection-1.46.0/build/win32/vs9/gi-gen-srcs.vsprops
--- gobject-introspection-1.45.3/build/win32/vs9/gi-gen-srcs.vsprops	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs9/gi-gen-srcs.vsprops	2015-07-30 10:32:27.000000000 +0000
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="gigensrcsprops"
-	InheritedPropertySheets=".\gi-build-defines.vsprops"
+	InheritedPropertySheets=".\gi-extra-paths.vsprops"
 	>
 	<UserMacro
 		Name="CopyConfigH"
@@ -12,28 +12,11 @@
 			  "
 	/>
 	<UserMacro
-		Name="CopyGIRScanner"
-		Value="
-copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner
-			  "
-	/>
-	<UserMacro
-		Name="CopyGIRDocTool"
-		Value="
-copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool
-			  "
+		Name="GenToolsScripts"
+		Value="$(PythonDir)\python ..\..\..\build\gen-win32-g-ir-tools.py"
 	/>
 	<UserMacro
-		Name="CopyGIRAnnotationTool"
-		Value="
-copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool
-		      "
-	/>
-	<UserMacro
-		Name="GenerateGIRDef"
-		Value="
-echo EXPORTS &gt; $(DefDir)\girepository.def&#x0D;&#x0A;
-cl -EP ..\..\..\girepository\girepository.symbols &gt;&gt; $(DefDir)\girepository.def&#x0D;&#x0A;
-			  "
+		Name="GenToolsScriptsX64"
+		Value="$(PythonDirX64)\python ..\..\..\build\gen-win32-g-ir-tools.py"
 	/>
 </VisualStudioPropertySheet>
diff -Nru gobject-introspection-1.45.3/build/win32/vs9/gi-install.vsprops gobject-introspection-1.46.0/build/win32/vs9/gi-install.vsprops
--- gobject-introspection-1.45.3/build/win32/vs9/gi-install.vsprops	2015-07-03 20:31:22.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs9/gi-install.vsprops	2015-09-22 11:27:24.000000000 +0000
@@ -66,6 +66,7 @@
 copy ..\..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
 copy ..\..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
 copy ..\..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
+copy ..\..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
 copy ..\..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
 copy ..\..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
 copy ..\..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
diff -Nru gobject-introspection-1.45.3/build/win32/vs9/gi-prebuild.vcproj gobject-introspection-1.46.0/build/win32/vs9/gi-prebuild.vcproj
--- gobject-introspection-1.45.3/build/win32/vs9/gi-prebuild.vcproj	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs9/gi-prebuild.vcproj	2015-07-30 10:32:27.000000000 +0000
@@ -94,105 +94,37 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File RelativePath="..\..\..\tools\g-ir-scanner.in">
+			<File RelativePath="..\..\..\tools\g-ir-tool-template.in">
 				<FileConfiguration Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScripts)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScripts)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Debug|x64">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScriptsX64)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Release|x64">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\tools\g-ir-doc-tool.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\tools\g-ir-annotation-tool.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScriptsX64)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 			</File>
diff -Nru gobject-introspection-1.45.3/build/win32/vs9/README.txt gobject-introspection-1.46.0/build/win32/vs9/README.txt
--- gobject-introspection-1.45.3/build/win32/vs9/README.txt	2014-02-07 16:24:37.000000000 +0000
+++ gobject-introspection-1.46.0/build/win32/vs9/README.txt	2015-07-30 10:32:27.000000000 +0000
@@ -50,17 +50,13 @@
 The libintl.h that is used for building GLib needs to be in
 <root>\vs9\<PlatformName>\include, if not already done so
 
-You will also need a working GCC/MinGW compiler installation
-in order to generate the .gir and .typelib files.  One may be
-obtained from the mingw or the mingw64 project.
-
 A working pkg-config tool is also required-it may be obtained from
 http://www.gtk.org/download/win32.php [32-bit]
 http://www.gtk.org/download/win64.php [64-bit]
 
 *** Note! ***
-Please note that due to numerous possible configurations on Python, PKG_CONFIG_PATH and
-MinGW, the build of G-I is now a 2-step process: one with the Visual Studio Projects that
+Please note that due to numerous possible configurations on Python and PKG_CONFIG_PATH,
+the build of G-I is now a 2-step process: one with the Visual Studio Projects that
 will build the libraries, tools, Python Module and test DLLs (except for the everything
 test), and the other one with NMake Makefiles for building the introspection files.
 Please note that if one needs to change the installation location
@@ -77,13 +73,6 @@
          You need to use an x64/amd64 version of Python for x64 builds, and a Win32/x86
          version of Python for Win32/x86 builds
 PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files.
-MINGWDIR: Root installation folder for your Windows GCC (such as MinGW).  For example,
-          if your gcc executable (gcc.exe) is in c:\mingw\bin, use "set MINGWDIR=c:\mingw"
-          You need to use an x64/amd64 version of gcc for x64 builds, and a Win32/x86
-          version of gcc for Win32/x86 builds
-
-GCC is currently needed to as the GCC preprocessor is used to create the introspection dump source
-file, which is then compiled with the Visual C++ compiler to produce the .gir files.
 
 Please see $(srcroot)\build\gi-introspection-msvc.mak for more details.  Doing
 "nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
diff -Nru gobject-introspection-1.45.3/config.h.win32 gobject-introspection-1.46.0/config.h.win32
--- gobject-introspection-1.45.3/config.h.win32	2015-07-03 20:30:38.000000000 +0000
+++ gobject-introspection-1.46.0/config.h.win32	2015-09-22 11:24:42.000000000 +0000
@@ -96,7 +96,7 @@
 #define PACKAGE_NAME "gobject-introspection"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gojbect-introspection 1.45.3"
+#define PACKAGE_STRING "gojbect-introspection 1.46.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "gobject-introspection"
@@ -105,7 +105,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.45.3"
+#define PACKAGE_VERSION "1.46.0"
 
 /* Define to the platform's shared library suffix */
 #define SHLIB_SUFFIX ".dll"
@@ -126,7 +126,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "1.45.3"
+#define VERSION "1.46.0"
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
diff -Nru gobject-introspection-1.45.3/configure gobject-introspection-1.46.0/configure
--- gobject-introspection-1.45.3/configure	2015-07-03 20:30:31.000000000 +0000
+++ gobject-introspection-1.46.0/configure	2015-09-22 11:24:37.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gobject-introspection 1.45.3.
+# Generated by GNU Autoconf 2.69 for gobject-introspection 1.46.0.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection>.
 #
@@ -591,8 +591,8 @@
 # Identity of this package.
 PACKAGE_NAME='gobject-introspection'
 PACKAGE_TARNAME='gobject-introspection'
-PACKAGE_VERSION='1.45.3'
-PACKAGE_STRING='gobject-introspection 1.45.3'
+PACKAGE_VERSION='1.46.0'
+PACKAGE_STRING='gobject-introspection 1.46.0'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection'
 PACKAGE_URL=''
 
@@ -1430,7 +1430,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gobject-introspection 1.45.3 to adapt to many kinds of systems.
+\`configure' configures gobject-introspection 1.46.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1501,7 +1501,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gobject-introspection 1.45.3:";;
+     short | recursive ) echo "Configuration of gobject-introspection 1.46.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1655,7 +1655,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gobject-introspection configure 1.45.3
+gobject-introspection configure 1.46.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2207,7 +2207,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gobject-introspection $as_me 1.45.3, which was
+It was created by gobject-introspection $as_me 1.46.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3075,7 +3075,7 @@
 
 # Define the identity of the package.
  PACKAGE='gobject-introspection'
- VERSION='1.45.3'
+ VERSION='1.46.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3349,7 +3349,7 @@
 
 
 # Used in docs/reference/version.xml
-GI_VERSION=1.45.3
+GI_VERSION=1.46.0
 
 
 # Check for Win32
@@ -15513,7 +15513,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gobject-introspection $as_me 1.45.3, which was
+This file was extended by gobject-introspection $as_me 1.46.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15579,7 +15579,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gobject-introspection config.status 1.45.3
+gobject-introspection config.status 1.46.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru gobject-introspection-1.45.3/configure.ac gobject-introspection-1.46.0/configure.ac
--- gobject-introspection-1.45.3/configure.ac	2015-07-03 20:29:28.000000000 +0000
+++ gobject-introspection-1.46.0/configure.ac	2015-09-22 11:24:07.000000000 +0000
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 45)
-m4_define(gi_micro_version, 3)
+m4_define(gi_minor_version, 46)
+m4_define(gi_micro_version, 0)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
diff -Nru gobject-introspection-1.45.3/debian/changelog gobject-introspection-1.46.0/debian/changelog
--- gobject-introspection-1.45.3/debian/changelog	2015-07-22 08:33:37.000000000 +0000
+++ gobject-introspection-1.46.0/debian/changelog	2015-09-23 07:12:25.000000000 +0000
@@ -1,3 +1,15 @@
+gobject-introspection (1.46.0-0ubuntu1~wily0) wily; urgency=high
+
+  * New upstream release
+
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Wed, 23 Sep 2015 09:12:25 +0200
+
+gobject-introspection (1.45.4-0ubuntu1~wily1) wily; urgency=medium
+
+  * New upstream release
+
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Thu, 03 Sep 2015 15:27:43 +0200
+
 gobject-introspection (1.45.3-0ubuntu1~wily1) wily; urgency=medium
 
   * New upstream release
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-common-types.html gobject-introspection-1.46.0/docs/reference/html/gi-common-types.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-common-types.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-common-types.html	2015-09-22 11:27:24.000000000 +0000
@@ -130,107 +130,107 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> <em class="structfield"><code><a name="GIArgument.v-boolean"></a>v_boolean</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gboolean</span> <em class="structfield"><code><a name="GIArgument.v-boolean"></a>v_boolean</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint8"><span class="type">gint8</span></a> <em class="structfield"><code><a name="GIArgument.v-int8"></a>v_int8</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gint8</span> <em class="structfield"><code><a name="GIArgument.v-int8"></a>v_int8</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="GIArgument.v-uint8"></a>v_uint8</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="GIArgument.v-uint8"></a>v_uint8</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint16"><span class="type">gint16</span></a> <em class="structfield"><code><a name="GIArgument.v-int16"></a>v_int16</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gint16</span> <em class="structfield"><code><a name="GIArgument.v-int16"></a>v_int16</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="GIArgument.v-uint16"></a>v_uint16</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="GIArgument.v-uint16"></a>v_uint16</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint32"><span class="type">gint32</span></a> <em class="structfield"><code><a name="GIArgument.v-int32"></a>v_int32</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gint32</span> <em class="structfield"><code><a name="GIArgument.v-int32"></a>v_int32</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="GIArgument.v-uint32"></a>v_uint32</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="GIArgument.v-uint32"></a>v_uint32</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="type">gint64</span></a> <em class="structfield"><code><a name="GIArgument.v-int64"></a>v_int64</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gint64</span> <em class="structfield"><code><a name="GIArgument.v-int64"></a>v_int64</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint64"><span class="type">guint64</span></a> <em class="structfield"><code><a name="GIArgument.v-uint64"></a>v_uint64</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint64</span> <em class="structfield"><code><a name="GIArgument.v-uint64"></a>v_uint64</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gfloat"><span class="type">gfloat</span></a> <em class="structfield"><code><a name="GIArgument.v-float"></a>v_float</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gfloat</span> <em class="structfield"><code><a name="GIArgument.v-float"></a>v_float</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> <em class="structfield"><code><a name="GIArgument.v-double"></a>v_double</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gdouble</span> <em class="structfield"><code><a name="GIArgument.v-double"></a>v_double</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gshort"><span class="type">gshort</span></a> <em class="structfield"><code><a name="GIArgument.v-short"></a>v_short</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gshort</span> <em class="structfield"><code><a name="GIArgument.v-short"></a>v_short</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gushort"><span class="type">gushort</span></a> <em class="structfield"><code><a name="GIArgument.v-ushort"></a>v_ushort</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gushort</span> <em class="structfield"><code><a name="GIArgument.v-ushort"></a>v_ushort</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> <em class="structfield"><code><a name="GIArgument.v-int"></a>v_int</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gint</span> <em class="structfield"><code><a name="GIArgument.v-int"></a>v_int</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GIArgument.v-uint"></a>v_uint</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="GIArgument.v-uint"></a>v_uint</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#glong"><span class="type">glong</span></a> <em class="structfield"><code><a name="GIArgument.v-long"></a>v_long</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">glong</span> <em class="structfield"><code><a name="GIArgument.v-long"></a>v_long</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gulong"><span class="type">gulong</span></a> <em class="structfield"><code><a name="GIArgument.v-ulong"></a>v_ulong</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gulong</span> <em class="structfield"><code><a name="GIArgument.v-ulong"></a>v_ulong</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gssize"><span class="type">gssize</span></a> <em class="structfield"><code><a name="GIArgument.v-ssize"></a>v_ssize</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gssize</span> <em class="structfield"><code><a name="GIArgument.v-ssize"></a>v_ssize</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> <em class="structfield"><code><a name="GIArgument.v-size"></a>v_size</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gsize</span> <em class="structfield"><code><a name="GIArgument.v-size"></a>v_size</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *<em class="structfield"><code><a name="GIArgument.v-string"></a>v_string</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gchar</span> *<em class="structfield"><code><a name="GIArgument.v-string"></a>v_string</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> <em class="structfield"><code><a name="GIArgument.v-pointer"></a>v_pointer</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">gpointer</span> <em class="structfield"><code><a name="GIArgument.v-pointer"></a>v_pointer</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
@@ -344,7 +344,7 @@
 <tr>
 <td class="enum_member_name"><p><a name="GI-TYPE-TAG-GTYPE:CAPS"></a>GI_TYPE_TAG_GTYPE</p></td>
 <td class="enum_member_description">
-<p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p>
+<p>a <span class="type">GType</span></p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -380,28 +380,28 @@
 <tr>
 <td class="enum_member_name"><p><a name="GI-TYPE-TAG-GLIST:CAPS"></a>GI_TYPE_TAG_GLIST</p></td>
 <td class="enum_member_description">
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a></p>
+<p>a <span class="type">GList</span></p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="GI-TYPE-TAG-GSLIST:CAPS"></a>GI_TYPE_TAG_GSLIST</p></td>
 <td class="enum_member_description">
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a></p>
+<p>a <span class="type">GSList</span></p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="GI-TYPE-TAG-GHASH:CAPS"></a>GI_TYPE_TAG_GHASH</p></td>
 <td class="enum_member_description">
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#GHashTable"><span class="type">GHashTable</span></a></p>
+<p>a <span class="type">GHashTable</span></p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="GI-TYPE-TAG-ERROR:CAPS"></a>GI_TYPE_TAG_ERROR</p></td>
 <td class="enum_member_description">
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p>
+<p>a <span class="type">GError</span></p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
@@ -447,14 +447,14 @@
 <tr>
 <td class="enum_member_name"><p><a name="GI-ARRAY-TYPE-PTR-ARRAY:CAPS"></a>GI_ARRAY_TYPE_PTR_ARRAY</p></td>
 <td class="enum_member_description">
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Pointer-Arrays.html#GPtrArray"><span class="type">GPtrArray</span></a> array</p>
+<p>a <span class="type">GPtrArray</span> array</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
 <tr>
 <td class="enum_member_name"><p><a name="GI-ARRAY-TYPE-BYTE-ARRAY:CAPS"></a>GI_ARRAY_TYPE_BYTE_ARRAY</p></td>
 <td class="enum_member_description">
-<p>a <a href="https://developer.gnome.org/glib/unstable/glib-Byte-Arrays.html#GByteArray"><span class="type">GByteArray</span></a> array</p>
+<p>a <span class="type">GByteArray</span> array</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi.devhelp2 gobject-introspection-1.46.0/docs/reference/html/gi.devhelp2
--- gobject-introspection-1.45.3/docs/reference/html/gi.devhelp2	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi.devhelp2	2015-09-22 11:27:24.000000000 +0000
@@ -436,5 +436,286 @@
     <keyword type="constant" name="G_TYPELIB_ERROR_INVALID_DIRECTORY" link="gi-GITypelib.html#G-TYPELIB-ERROR-INVALID-DIRECTORY:CAPS"/>
     <keyword type="constant" name="G_TYPELIB_ERROR_INVALID_ENTRY" link="gi-GITypelib.html#G-TYPELIB-ERROR-INVALID-ENTRY:CAPS"/>
     <keyword type="constant" name="G_TYPELIB_ERROR_INVALID_BLOB" link="gi-GITypelib.html#G-TYPELIB-ERROR-INVALID-BLOB:CAPS"/>
+    <keyword type="member" name="Header.magic" link="gi-GITypelib.html#Header.magic"/>
+    <keyword type="member" name="Header.major-version" link="gi-GITypelib.html#Header.major-version"/>
+    <keyword type="member" name="Header.minor-version" link="gi-GITypelib.html#Header.minor-version"/>
+    <keyword type="member" name="Header.reserved" link="gi-GITypelib.html#Header.reserved"/>
+    <keyword type="member" name="Header.n-entries" link="gi-GITypelib.html#Header.n-entries"/>
+    <keyword type="member" name="Header.n-local-entries" link="gi-GITypelib.html#Header.n-local-entries"/>
+    <keyword type="member" name="Header.directory" link="gi-GITypelib.html#Header.directory"/>
+    <keyword type="member" name="Header.n-attributes" link="gi-GITypelib.html#Header.n-attributes"/>
+    <keyword type="member" name="Header.attributes" link="gi-GITypelib.html#Header.attributes"/>
+    <keyword type="member" name="Header.dependencies" link="gi-GITypelib.html#Header.dependencies"/>
+    <keyword type="member" name="Header.size" link="gi-GITypelib.html#Header.size"/>
+    <keyword type="member" name="Header.namespace" link="gi-GITypelib.html#Header.namespace"/>
+    <keyword type="member" name="Header.nsversion" link="gi-GITypelib.html#Header.nsversion"/>
+    <keyword type="member" name="Header.shared-library" link="gi-GITypelib.html#Header.shared-library"/>
+    <keyword type="member" name="Header.c-prefix" link="gi-GITypelib.html#Header.c-prefix"/>
+    <keyword type="member" name="Header.entry-blob-size" link="gi-GITypelib.html#Header.entry-blob-size"/>
+    <keyword type="member" name="Header.function-blob-size" link="gi-GITypelib.html#Header.function-blob-size"/>
+    <keyword type="member" name="Header.callback-blob-size" link="gi-GITypelib.html#Header.callback-blob-size"/>
+    <keyword type="member" name="Header.signal-blob-size" link="gi-GITypelib.html#Header.signal-blob-size"/>
+    <keyword type="member" name="Header.vfunc-blob-size" link="gi-GITypelib.html#Header.vfunc-blob-size"/>
+    <keyword type="member" name="Header.arg-blob-size" link="gi-GITypelib.html#Header.arg-blob-size"/>
+    <keyword type="member" name="Header.property-blob-size" link="gi-GITypelib.html#Header.property-blob-size"/>
+    <keyword type="member" name="Header.field-blob-size" link="gi-GITypelib.html#Header.field-blob-size"/>
+    <keyword type="member" name="Header.value-blob-size" link="gi-GITypelib.html#Header.value-blob-size"/>
+    <keyword type="member" name="Header.attribute-blob-size" link="gi-GITypelib.html#Header.attribute-blob-size"/>
+    <keyword type="member" name="Header.constant-blob-size" link="gi-GITypelib.html#Header.constant-blob-size"/>
+    <keyword type="member" name="Header.error-domain-blob-size" link="gi-GITypelib.html#Header.error-domain-blob-size"/>
+    <keyword type="member" name="Header.signature-blob-size" link="gi-GITypelib.html#Header.signature-blob-size"/>
+    <keyword type="member" name="Header.enum-blob-size" link="gi-GITypelib.html#Header.enum-blob-size"/>
+    <keyword type="member" name="Header.struct-blob-size" link="gi-GITypelib.html#Header.struct-blob-size"/>
+    <keyword type="member" name="Header.object-blob-size" link="gi-GITypelib.html#Header.object-blob-size"/>
+    <keyword type="member" name="Header.interface-blob-size" link="gi-GITypelib.html#Header.interface-blob-size"/>
+    <keyword type="member" name="Header.union-blob-size" link="gi-GITypelib.html#Header.union-blob-size"/>
+    <keyword type="member" name="Header.sections" link="gi-GITypelib.html#Header.sections"/>
+    <keyword type="member" name="Header.padding" link="gi-GITypelib.html#Header.padding"/>
+    <keyword type="member" name="Section.id" link="gi-GITypelib.html#Section.id"/>
+    <keyword type="member" name="Section.offset" link="gi-GITypelib.html#Section.offset"/>
+    <keyword type="member" name="DirEntry.blob-type" link="gi-GITypelib.html#DirEntry.blob-type"/>
+    <keyword type="member" name="DirEntry.local" link="gi-GITypelib.html#DirEntry.local"/>
+    <keyword type="member" name="DirEntry.reserved" link="gi-GITypelib.html#DirEntry.reserved"/>
+    <keyword type="member" name="DirEntry.name" link="gi-GITypelib.html#DirEntry.name"/>
+    <keyword type="member" name="DirEntry.offset" link="gi-GITypelib.html#DirEntry.offset"/>
+    <keyword type="member" name="SimpleTypeBlobFlags.reserved" link="gi-GITypelib.html#SimpleTypeBlobFlags.reserved"/>
+    <keyword type="member" name="SimpleTypeBlobFlags.reserved2" link="gi-GITypelib.html#SimpleTypeBlobFlags.reserved2"/>
+    <keyword type="member" name="SimpleTypeBlobFlags.pointer" link="gi-GITypelib.html#SimpleTypeBlobFlags.pointer"/>
+    <keyword type="member" name="SimpleTypeBlobFlags.reserved3" link="gi-GITypelib.html#SimpleTypeBlobFlags.reserved3"/>
+    <keyword type="member" name="SimpleTypeBlobFlags.tag" link="gi-GITypelib.html#SimpleTypeBlobFlags.tag"/>
+    <keyword type="member" name="ArgBlob.name" link="gi-GITypelib.html#ArgBlob.name"/>
+    <keyword type="member" name="ArgBlob.in" link="gi-GITypelib.html#ArgBlob.in"/>
+    <keyword type="member" name="ArgBlob.out" link="gi-GITypelib.html#ArgBlob.out"/>
+    <keyword type="member" name="ArgBlob.caller-allocates" link="gi-GITypelib.html#ArgBlob.caller-allocates"/>
+    <keyword type="member" name="ArgBlob.nullable" link="gi-GITypelib.html#ArgBlob.nullable"/>
+    <keyword type="member" name="ArgBlob.optional" link="gi-GITypelib.html#ArgBlob.optional"/>
+    <keyword type="member" name="ArgBlob.transfer-ownership" link="gi-GITypelib.html#ArgBlob.transfer-ownership"/>
+    <keyword type="member" name="ArgBlob.transfer-container-ownership" link="gi-GITypelib.html#ArgBlob.transfer-container-ownership"/>
+    <keyword type="member" name="ArgBlob.return-value" link="gi-GITypelib.html#ArgBlob.return-value"/>
+    <keyword type="member" name="ArgBlob.scope" link="gi-GITypelib.html#ArgBlob.scope"/>
+    <keyword type="member" name="ArgBlob.skip" link="gi-GITypelib.html#ArgBlob.skip"/>
+    <keyword type="member" name="ArgBlob.reserved" link="gi-GITypelib.html#ArgBlob.reserved"/>
+    <keyword type="member" name="ArgBlob.closure" link="gi-GITypelib.html#ArgBlob.closure"/>
+    <keyword type="member" name="ArgBlob.destroy" link="gi-GITypelib.html#ArgBlob.destroy"/>
+    <keyword type="member" name="ArgBlob.padding" link="gi-GITypelib.html#ArgBlob.padding"/>
+    <keyword type="member" name="ArgBlob.arg-type" link="gi-GITypelib.html#ArgBlob.arg-type"/>
+    <keyword type="member" name="SignatureBlob.return-type" link="gi-GITypelib.html#SignatureBlob.return-type"/>
+    <keyword type="member" name="SignatureBlob.may-return-null" link="gi-GITypelib.html#SignatureBlob.may-return-null"/>
+    <keyword type="member" name="SignatureBlob.caller-owns-return-value" link="gi-GITypelib.html#SignatureBlob.caller-owns-return-value"/>
+    <keyword type="member" name="SignatureBlob.caller-owns-return-container" link="gi-GITypelib.html#SignatureBlob.caller-owns-return-container"/>
+    <keyword type="member" name="SignatureBlob.skip-return" link="gi-GITypelib.html#SignatureBlob.skip-return"/>
+    <keyword type="member" name="SignatureBlob.instance-transfer-ownership" link="gi-GITypelib.html#SignatureBlob.instance-transfer-ownership"/>
+    <keyword type="member" name="SignatureBlob.throws" link="gi-GITypelib.html#SignatureBlob.throws"/>
+    <keyword type="member" name="SignatureBlob.reserved" link="gi-GITypelib.html#SignatureBlob.reserved"/>
+    <keyword type="member" name="SignatureBlob.n-arguments" link="gi-GITypelib.html#SignatureBlob.n-arguments"/>
+    <keyword type="member" name="SignatureBlob.arguments" link="gi-GITypelib.html#SignatureBlob.arguments"/>
+    <keyword type="member" name="CommonBlob.blob-type" link="gi-GITypelib.html#CommonBlob.blob-type"/>
+    <keyword type="member" name="CommonBlob.deprecated" link="gi-GITypelib.html#CommonBlob.deprecated"/>
+    <keyword type="member" name="CommonBlob.reserved" link="gi-GITypelib.html#CommonBlob.reserved"/>
+    <keyword type="member" name="CommonBlob.name" link="gi-GITypelib.html#CommonBlob.name"/>
+    <keyword type="member" name="FunctionBlob.blob-type" link="gi-GITypelib.html#FunctionBlob.blob-type"/>
+    <keyword type="member" name="FunctionBlob.deprecated" link="gi-GITypelib.html#FunctionBlob.deprecated"/>
+    <keyword type="member" name="FunctionBlob.setter" link="gi-GITypelib.html#FunctionBlob.setter"/>
+    <keyword type="member" name="FunctionBlob.getter" link="gi-GITypelib.html#FunctionBlob.getter"/>
+    <keyword type="member" name="FunctionBlob.constructor" link="gi-GITypelib.html#FunctionBlob.constructor"/>
+    <keyword type="member" name="FunctionBlob.wraps-vfunc" link="gi-GITypelib.html#FunctionBlob.wraps-vfunc"/>
+    <keyword type="member" name="FunctionBlob.throws" link="gi-GITypelib.html#FunctionBlob.throws"/>
+    <keyword type="member" name="FunctionBlob.index" link="gi-GITypelib.html#FunctionBlob.index"/>
+    <keyword type="member" name="FunctionBlob.name" link="gi-GITypelib.html#FunctionBlob.name"/>
+    <keyword type="member" name="FunctionBlob.symbol" link="gi-GITypelib.html#FunctionBlob.symbol"/>
+    <keyword type="member" name="FunctionBlob.signature" link="gi-GITypelib.html#FunctionBlob.signature"/>
+    <keyword type="member" name="FunctionBlob.is-static" link="gi-GITypelib.html#FunctionBlob.is-static"/>
+    <keyword type="member" name="FunctionBlob.reserved" link="gi-GITypelib.html#FunctionBlob.reserved"/>
+    <keyword type="member" name="FunctionBlob.reserved2" link="gi-GITypelib.html#FunctionBlob.reserved2"/>
+    <keyword type="member" name="CallbackBlob.blob-type" link="gi-GITypelib.html#CallbackBlob.blob-type"/>
+    <keyword type="member" name="CallbackBlob.deprecated" link="gi-GITypelib.html#CallbackBlob.deprecated"/>
+    <keyword type="member" name="CallbackBlob.reserved" link="gi-GITypelib.html#CallbackBlob.reserved"/>
+    <keyword type="member" name="CallbackBlob.name" link="gi-GITypelib.html#CallbackBlob.name"/>
+    <keyword type="member" name="CallbackBlob.signature" link="gi-GITypelib.html#CallbackBlob.signature"/>
+    <keyword type="member" name="InterfaceTypeBlob.pointer" link="gi-GITypelib.html#InterfaceTypeBlob.pointer"/>
+    <keyword type="member" name="InterfaceTypeBlob.reserved" link="gi-GITypelib.html#InterfaceTypeBlob.reserved"/>
+    <keyword type="member" name="InterfaceTypeBlob.tag" link="gi-GITypelib.html#InterfaceTypeBlob.tag"/>
+    <keyword type="member" name="InterfaceTypeBlob.reserved2" link="gi-GITypelib.html#InterfaceTypeBlob.reserved2"/>
+    <keyword type="member" name="InterfaceTypeBlob.interface" link="gi-GITypelib.html#InterfaceTypeBlob.interface"/>
+    <keyword type="member" name="ArrayTypeBlob.pointer" link="gi-GITypelib.html#ArrayTypeBlob.pointer"/>
+    <keyword type="member" name="ArrayTypeBlob.reserved" link="gi-GITypelib.html#ArrayTypeBlob.reserved"/>
+    <keyword type="member" name="ArrayTypeBlob.tag" link="gi-GITypelib.html#ArrayTypeBlob.tag"/>
+    <keyword type="member" name="ArrayTypeBlob.zero-terminated" link="gi-GITypelib.html#ArrayTypeBlob.zero-terminated"/>
+    <keyword type="member" name="ArrayTypeBlob.has-length" link="gi-GITypelib.html#ArrayTypeBlob.has-length"/>
+    <keyword type="member" name="ArrayTypeBlob.has-size" link="gi-GITypelib.html#ArrayTypeBlob.has-size"/>
+    <keyword type="member" name="ArrayTypeBlob.array-type" link="gi-GITypelib.html#ArrayTypeBlob.array-type"/>
+    <keyword type="member" name="ArrayTypeBlob.reserved2" link="gi-GITypelib.html#ArrayTypeBlob.reserved2"/>
+    <keyword type="member" name="ArrayTypeBlob.dimensions" link="gi-GITypelib.html#ArrayTypeBlob.dimensions"/>
+    <keyword type="member" name="ArrayTypeBlob.type" link="gi-GITypelib.html#ArrayTypeBlob.type"/>
+    <keyword type="member" name="ParamTypeBlob.pointer" link="gi-GITypelib.html#ParamTypeBlob.pointer"/>
+    <keyword type="member" name="ParamTypeBlob.reserved" link="gi-GITypelib.html#ParamTypeBlob.reserved"/>
+    <keyword type="member" name="ParamTypeBlob.tag" link="gi-GITypelib.html#ParamTypeBlob.tag"/>
+    <keyword type="member" name="ParamTypeBlob.reserved2" link="gi-GITypelib.html#ParamTypeBlob.reserved2"/>
+    <keyword type="member" name="ParamTypeBlob.n-types" link="gi-GITypelib.html#ParamTypeBlob.n-types"/>
+    <keyword type="member" name="ParamTypeBlob.type" link="gi-GITypelib.html#ParamTypeBlob.type"/>
+    <keyword type="member" name="ErrorTypeBlob.pointer" link="gi-GITypelib.html#ErrorTypeBlob.pointer"/>
+    <keyword type="member" name="ErrorTypeBlob.reserved" link="gi-GITypelib.html#ErrorTypeBlob.reserved"/>
+    <keyword type="member" name="ErrorTypeBlob.tag" link="gi-GITypelib.html#ErrorTypeBlob.tag"/>
+    <keyword type="member" name="ErrorTypeBlob.reserved2" link="gi-GITypelib.html#ErrorTypeBlob.reserved2"/>
+    <keyword type="member" name="ErrorTypeBlob.n-domains" link="gi-GITypelib.html#ErrorTypeBlob.n-domains"/>
+    <keyword type="member" name="ErrorTypeBlob.domains" link="gi-GITypelib.html#ErrorTypeBlob.domains"/>
+    <keyword type="member" name="ValueBlob.deprecated" link="gi-GITypelib.html#ValueBlob.deprecated"/>
+    <keyword type="member" name="ValueBlob.unsigned-value" link="gi-GITypelib.html#ValueBlob.unsigned-value"/>
+    <keyword type="member" name="ValueBlob.reserved" link="gi-GITypelib.html#ValueBlob.reserved"/>
+    <keyword type="member" name="ValueBlob.name" link="gi-GITypelib.html#ValueBlob.name"/>
+    <keyword type="member" name="ValueBlob.value" link="gi-GITypelib.html#ValueBlob.value"/>
+    <keyword type="member" name="FieldBlob.name" link="gi-GITypelib.html#FieldBlob.name"/>
+    <keyword type="member" name="FieldBlob.readable" link="gi-GITypelib.html#FieldBlob.readable"/>
+    <keyword type="member" name="FieldBlob.writable" link="gi-GITypelib.html#FieldBlob.writable"/>
+    <keyword type="member" name="FieldBlob.has-embedded-type" link="gi-GITypelib.html#FieldBlob.has-embedded-type"/>
+    <keyword type="member" name="FieldBlob.reserved" link="gi-GITypelib.html#FieldBlob.reserved"/>
+    <keyword type="member" name="FieldBlob.bits" link="gi-GITypelib.html#FieldBlob.bits"/>
+    <keyword type="member" name="FieldBlob.struct-offset" link="gi-GITypelib.html#FieldBlob.struct-offset"/>
+    <keyword type="member" name="FieldBlob.reserved2" link="gi-GITypelib.html#FieldBlob.reserved2"/>
+    <keyword type="member" name="FieldBlob.type" link="gi-GITypelib.html#FieldBlob.type"/>
+    <keyword type="member" name="RegisteredTypeBlob.blob-type" link="gi-GITypelib.html#RegisteredTypeBlob.blob-type"/>
+    <keyword type="member" name="RegisteredTypeBlob.deprecated" link="gi-GITypelib.html#RegisteredTypeBlob.deprecated"/>
+    <keyword type="member" name="RegisteredTypeBlob.unregistered" link="gi-GITypelib.html#RegisteredTypeBlob.unregistered"/>
+    <keyword type="member" name="RegisteredTypeBlob.reserved" link="gi-GITypelib.html#RegisteredTypeBlob.reserved"/>
+    <keyword type="member" name="RegisteredTypeBlob.name" link="gi-GITypelib.html#RegisteredTypeBlob.name"/>
+    <keyword type="member" name="RegisteredTypeBlob.gtype-name" link="gi-GITypelib.html#RegisteredTypeBlob.gtype-name"/>
+    <keyword type="member" name="RegisteredTypeBlob.gtype-init" link="gi-GITypelib.html#RegisteredTypeBlob.gtype-init"/>
+    <keyword type="member" name="StructBlob.blob-type" link="gi-GITypelib.html#StructBlob.blob-type"/>
+    <keyword type="member" name="StructBlob.deprecated" link="gi-GITypelib.html#StructBlob.deprecated"/>
+    <keyword type="member" name="StructBlob.unregistered" link="gi-GITypelib.html#StructBlob.unregistered"/>
+    <keyword type="member" name="StructBlob.is-gtype-struct" link="gi-GITypelib.html#StructBlob.is-gtype-struct"/>
+    <keyword type="member" name="StructBlob.alignment" link="gi-GITypelib.html#StructBlob.alignment"/>
+    <keyword type="member" name="StructBlob.foreign" link="gi-GITypelib.html#StructBlob.foreign"/>
+    <keyword type="member" name="StructBlob.reserved" link="gi-GITypelib.html#StructBlob.reserved"/>
+    <keyword type="member" name="StructBlob.name" link="gi-GITypelib.html#StructBlob.name"/>
+    <keyword type="member" name="StructBlob.gtype-name" link="gi-GITypelib.html#StructBlob.gtype-name"/>
+    <keyword type="member" name="StructBlob.gtype-init" link="gi-GITypelib.html#StructBlob.gtype-init"/>
+    <keyword type="member" name="StructBlob.size" link="gi-GITypelib.html#StructBlob.size"/>
+    <keyword type="member" name="StructBlob.n-fields" link="gi-GITypelib.html#StructBlob.n-fields"/>
+    <keyword type="member" name="StructBlob.n-methods" link="gi-GITypelib.html#StructBlob.n-methods"/>
+    <keyword type="member" name="StructBlob.reserved2" link="gi-GITypelib.html#StructBlob.reserved2"/>
+    <keyword type="member" name="StructBlob.reserved3" link="gi-GITypelib.html#StructBlob.reserved3"/>
+    <keyword type="member" name="UnionBlob.blob-type" link="gi-GITypelib.html#UnionBlob.blob-type"/>
+    <keyword type="member" name="UnionBlob.deprecated" link="gi-GITypelib.html#UnionBlob.deprecated"/>
+    <keyword type="member" name="UnionBlob.unregistered" link="gi-GITypelib.html#UnionBlob.unregistered"/>
+    <keyword type="member" name="UnionBlob.discriminated" link="gi-GITypelib.html#UnionBlob.discriminated"/>
+    <keyword type="member" name="UnionBlob.alignment" link="gi-GITypelib.html#UnionBlob.alignment"/>
+    <keyword type="member" name="UnionBlob.reserved" link="gi-GITypelib.html#UnionBlob.reserved"/>
+    <keyword type="member" name="UnionBlob.name" link="gi-GITypelib.html#UnionBlob.name"/>
+    <keyword type="member" name="UnionBlob.gtype-name" link="gi-GITypelib.html#UnionBlob.gtype-name"/>
+    <keyword type="member" name="UnionBlob.gtype-init" link="gi-GITypelib.html#UnionBlob.gtype-init"/>
+    <keyword type="member" name="UnionBlob.size" link="gi-GITypelib.html#UnionBlob.size"/>
+    <keyword type="member" name="UnionBlob.n-fields" link="gi-GITypelib.html#UnionBlob.n-fields"/>
+    <keyword type="member" name="UnionBlob.n-functions" link="gi-GITypelib.html#UnionBlob.n-functions"/>
+    <keyword type="member" name="UnionBlob.reserved2" link="gi-GITypelib.html#UnionBlob.reserved2"/>
+    <keyword type="member" name="UnionBlob.reserved3" link="gi-GITypelib.html#UnionBlob.reserved3"/>
+    <keyword type="member" name="UnionBlob.discriminator-offset" link="gi-GITypelib.html#UnionBlob.discriminator-offset"/>
+    <keyword type="member" name="UnionBlob.discriminator-type" link="gi-GITypelib.html#UnionBlob.discriminator-type"/>
+    <keyword type="member" name="EnumBlob.blob-type" link="gi-GITypelib.html#EnumBlob.blob-type"/>
+    <keyword type="member" name="EnumBlob.deprecated" link="gi-GITypelib.html#EnumBlob.deprecated"/>
+    <keyword type="member" name="EnumBlob.unregistered" link="gi-GITypelib.html#EnumBlob.unregistered"/>
+    <keyword type="member" name="EnumBlob.storage-type" link="gi-GITypelib.html#EnumBlob.storage-type"/>
+    <keyword type="member" name="EnumBlob.reserved" link="gi-GITypelib.html#EnumBlob.reserved"/>
+    <keyword type="member" name="EnumBlob.name" link="gi-GITypelib.html#EnumBlob.name"/>
+    <keyword type="member" name="EnumBlob.gtype-name" link="gi-GITypelib.html#EnumBlob.gtype-name"/>
+    <keyword type="member" name="EnumBlob.gtype-init" link="gi-GITypelib.html#EnumBlob.gtype-init"/>
+    <keyword type="member" name="EnumBlob.n-values" link="gi-GITypelib.html#EnumBlob.n-values"/>
+    <keyword type="member" name="EnumBlob.n-methods" link="gi-GITypelib.html#EnumBlob.n-methods"/>
+    <keyword type="member" name="EnumBlob.error-domain" link="gi-GITypelib.html#EnumBlob.error-domain"/>
+    <keyword type="member" name="EnumBlob.values" link="gi-GITypelib.html#EnumBlob.values"/>
+    <keyword type="member" name="PropertyBlob.name" link="gi-GITypelib.html#PropertyBlob.name"/>
+    <keyword type="member" name="PropertyBlob.deprecated" link="gi-GITypelib.html#PropertyBlob.deprecated"/>
+    <keyword type="member" name="PropertyBlob.readable" link="gi-GITypelib.html#PropertyBlob.readable"/>
+    <keyword type="member" name="PropertyBlob.writable" link="gi-GITypelib.html#PropertyBlob.writable"/>
+    <keyword type="member" name="PropertyBlob.construct" link="gi-GITypelib.html#PropertyBlob.construct"/>
+    <keyword type="member" name="PropertyBlob.construct-only" link="gi-GITypelib.html#PropertyBlob.construct-only"/>
+    <keyword type="member" name="PropertyBlob.transfer-ownership" link="gi-GITypelib.html#PropertyBlob.transfer-ownership"/>
+    <keyword type="member" name="PropertyBlob.transfer-container-ownership" link="gi-GITypelib.html#PropertyBlob.transfer-container-ownership"/>
+    <keyword type="member" name="PropertyBlob.reserved" link="gi-GITypelib.html#PropertyBlob.reserved"/>
+    <keyword type="member" name="PropertyBlob.reserved2" link="gi-GITypelib.html#PropertyBlob.reserved2"/>
+    <keyword type="member" name="PropertyBlob.type" link="gi-GITypelib.html#PropertyBlob.type"/>
+    <keyword type="member" name="SignalBlob.deprecated" link="gi-GITypelib.html#SignalBlob.deprecated"/>
+    <keyword type="member" name="SignalBlob.run-first" link="gi-GITypelib.html#SignalBlob.run-first"/>
+    <keyword type="member" name="SignalBlob.run-last" link="gi-GITypelib.html#SignalBlob.run-last"/>
+    <keyword type="member" name="SignalBlob.run-cleanup" link="gi-GITypelib.html#SignalBlob.run-cleanup"/>
+    <keyword type="member" name="SignalBlob.no-recurse" link="gi-GITypelib.html#SignalBlob.no-recurse"/>
+    <keyword type="member" name="SignalBlob.detailed" link="gi-GITypelib.html#SignalBlob.detailed"/>
+    <keyword type="member" name="SignalBlob.action" link="gi-GITypelib.html#SignalBlob.action"/>
+    <keyword type="member" name="SignalBlob.no-hooks" link="gi-GITypelib.html#SignalBlob.no-hooks"/>
+    <keyword type="member" name="SignalBlob.has-class-closure" link="gi-GITypelib.html#SignalBlob.has-class-closure"/>
+    <keyword type="member" name="SignalBlob.true-stops-emit" link="gi-GITypelib.html#SignalBlob.true-stops-emit"/>
+    <keyword type="member" name="SignalBlob.reserved" link="gi-GITypelib.html#SignalBlob.reserved"/>
+    <keyword type="member" name="SignalBlob.class-closure" link="gi-GITypelib.html#SignalBlob.class-closure"/>
+    <keyword type="member" name="SignalBlob.name" link="gi-GITypelib.html#SignalBlob.name"/>
+    <keyword type="member" name="SignalBlob.reserved2" link="gi-GITypelib.html#SignalBlob.reserved2"/>
+    <keyword type="member" name="SignalBlob.signature" link="gi-GITypelib.html#SignalBlob.signature"/>
+    <keyword type="member" name="VFuncBlob.name" link="gi-GITypelib.html#VFuncBlob.name"/>
+    <keyword type="member" name="VFuncBlob.must-chain-up" link="gi-GITypelib.html#VFuncBlob.must-chain-up"/>
+    <keyword type="member" name="VFuncBlob.must-be-implemented" link="gi-GITypelib.html#VFuncBlob.must-be-implemented"/>
+    <keyword type="member" name="VFuncBlob.must-not-be-implemented" link="gi-GITypelib.html#VFuncBlob.must-not-be-implemented"/>
+    <keyword type="member" name="VFuncBlob.class-closure" link="gi-GITypelib.html#VFuncBlob.class-closure"/>
+    <keyword type="member" name="VFuncBlob.throws" link="gi-GITypelib.html#VFuncBlob.throws"/>
+    <keyword type="member" name="VFuncBlob.reserved" link="gi-GITypelib.html#VFuncBlob.reserved"/>
+    <keyword type="member" name="VFuncBlob.signal" link="gi-GITypelib.html#VFuncBlob.signal"/>
+    <keyword type="member" name="VFuncBlob.struct-offset" link="gi-GITypelib.html#VFuncBlob.struct-offset"/>
+    <keyword type="member" name="VFuncBlob.invoker" link="gi-GITypelib.html#VFuncBlob.invoker"/>
+    <keyword type="member" name="VFuncBlob.reserved2" link="gi-GITypelib.html#VFuncBlob.reserved2"/>
+    <keyword type="member" name="VFuncBlob.reserved3" link="gi-GITypelib.html#VFuncBlob.reserved3"/>
+    <keyword type="member" name="VFuncBlob.signature" link="gi-GITypelib.html#VFuncBlob.signature"/>
+    <keyword type="member" name="ObjectBlob.blob-type" link="gi-GITypelib.html#ObjectBlob.blob-type"/>
+    <keyword type="member" name="ObjectBlob.deprecated" link="gi-GITypelib.html#ObjectBlob.deprecated"/>
+    <keyword type="member" name="ObjectBlob.abstract" link="gi-GITypelib.html#ObjectBlob.abstract"/>
+    <keyword type="member" name="ObjectBlob.fundamental" link="gi-GITypelib.html#ObjectBlob.fundamental"/>
+    <keyword type="member" name="ObjectBlob.reserved" link="gi-GITypelib.html#ObjectBlob.reserved"/>
+    <keyword type="member" name="ObjectBlob.name" link="gi-GITypelib.html#ObjectBlob.name"/>
+    <keyword type="member" name="ObjectBlob.gtype-name" link="gi-GITypelib.html#ObjectBlob.gtype-name"/>
+    <keyword type="member" name="ObjectBlob.gtype-init" link="gi-GITypelib.html#ObjectBlob.gtype-init"/>
+    <keyword type="member" name="ObjectBlob.parent" link="gi-GITypelib.html#ObjectBlob.parent"/>
+    <keyword type="member" name="ObjectBlob.gtype-struct" link="gi-GITypelib.html#ObjectBlob.gtype-struct"/>
+    <keyword type="member" name="ObjectBlob.n-interfaces" link="gi-GITypelib.html#ObjectBlob.n-interfaces"/>
+    <keyword type="member" name="ObjectBlob.n-fields" link="gi-GITypelib.html#ObjectBlob.n-fields"/>
+    <keyword type="member" name="ObjectBlob.n-properties" link="gi-GITypelib.html#ObjectBlob.n-properties"/>
+    <keyword type="member" name="ObjectBlob.n-methods" link="gi-GITypelib.html#ObjectBlob.n-methods"/>
+    <keyword type="member" name="ObjectBlob.n-signals" link="gi-GITypelib.html#ObjectBlob.n-signals"/>
+    <keyword type="member" name="ObjectBlob.n-vfuncs" link="gi-GITypelib.html#ObjectBlob.n-vfuncs"/>
+    <keyword type="member" name="ObjectBlob.n-constants" link="gi-GITypelib.html#ObjectBlob.n-constants"/>
+    <keyword type="member" name="ObjectBlob.reserved2" link="gi-GITypelib.html#ObjectBlob.reserved2"/>
+    <keyword type="member" name="ObjectBlob.ref-func" link="gi-GITypelib.html#ObjectBlob.ref-func"/>
+    <keyword type="member" name="ObjectBlob.unref-func" link="gi-GITypelib.html#ObjectBlob.unref-func"/>
+    <keyword type="member" name="ObjectBlob.set-value-func" link="gi-GITypelib.html#ObjectBlob.set-value-func"/>
+    <keyword type="member" name="ObjectBlob.get-value-func" link="gi-GITypelib.html#ObjectBlob.get-value-func"/>
+    <keyword type="member" name="ObjectBlob.reserved3" link="gi-GITypelib.html#ObjectBlob.reserved3"/>
+    <keyword type="member" name="ObjectBlob.reserved4" link="gi-GITypelib.html#ObjectBlob.reserved4"/>
+    <keyword type="member" name="ObjectBlob.interfaces" link="gi-GITypelib.html#ObjectBlob.interfaces"/>
+    <keyword type="member" name="InterfaceBlob.blob-type" link="gi-GITypelib.html#InterfaceBlob.blob-type"/>
+    <keyword type="member" name="InterfaceBlob.deprecated" link="gi-GITypelib.html#InterfaceBlob.deprecated"/>
+    <keyword type="member" name="InterfaceBlob.reserved" link="gi-GITypelib.html#InterfaceBlob.reserved"/>
+    <keyword type="member" name="InterfaceBlob.name" link="gi-GITypelib.html#InterfaceBlob.name"/>
+    <keyword type="member" name="InterfaceBlob.gtype-name" link="gi-GITypelib.html#InterfaceBlob.gtype-name"/>
+    <keyword type="member" name="InterfaceBlob.gtype-init" link="gi-GITypelib.html#InterfaceBlob.gtype-init"/>
+    <keyword type="member" name="InterfaceBlob.gtype-struct" link="gi-GITypelib.html#InterfaceBlob.gtype-struct"/>
+    <keyword type="member" name="InterfaceBlob.n-prerequisites" link="gi-GITypelib.html#InterfaceBlob.n-prerequisites"/>
+    <keyword type="member" name="InterfaceBlob.n-properties" link="gi-GITypelib.html#InterfaceBlob.n-properties"/>
+    <keyword type="member" name="InterfaceBlob.n-methods" link="gi-GITypelib.html#InterfaceBlob.n-methods"/>
+    <keyword type="member" name="InterfaceBlob.n-signals" link="gi-GITypelib.html#InterfaceBlob.n-signals"/>
+    <keyword type="member" name="InterfaceBlob.n-vfuncs" link="gi-GITypelib.html#InterfaceBlob.n-vfuncs"/>
+    <keyword type="member" name="InterfaceBlob.n-constants" link="gi-GITypelib.html#InterfaceBlob.n-constants"/>
+    <keyword type="member" name="InterfaceBlob.padding" link="gi-GITypelib.html#InterfaceBlob.padding"/>
+    <keyword type="member" name="InterfaceBlob.reserved2" link="gi-GITypelib.html#InterfaceBlob.reserved2"/>
+    <keyword type="member" name="InterfaceBlob.reserved3" link="gi-GITypelib.html#InterfaceBlob.reserved3"/>
+    <keyword type="member" name="InterfaceBlob.prerequisites" link="gi-GITypelib.html#InterfaceBlob.prerequisites"/>
+    <keyword type="member" name="ConstantBlob.blob-type" link="gi-GITypelib.html#ConstantBlob.blob-type"/>
+    <keyword type="member" name="ConstantBlob.deprecated" link="gi-GITypelib.html#ConstantBlob.deprecated"/>
+    <keyword type="member" name="ConstantBlob.reserved" link="gi-GITypelib.html#ConstantBlob.reserved"/>
+    <keyword type="member" name="ConstantBlob.name" link="gi-GITypelib.html#ConstantBlob.name"/>
+    <keyword type="member" name="ConstantBlob.type" link="gi-GITypelib.html#ConstantBlob.type"/>
+    <keyword type="member" name="ConstantBlob.size" link="gi-GITypelib.html#ConstantBlob.size"/>
+    <keyword type="member" name="ConstantBlob.offset" link="gi-GITypelib.html#ConstantBlob.offset"/>
+    <keyword type="member" name="ConstantBlob.reserved2" link="gi-GITypelib.html#ConstantBlob.reserved2"/>
+    <keyword type="member" name="AttributeBlob.offset" link="gi-GITypelib.html#AttributeBlob.offset"/>
+    <keyword type="member" name="AttributeBlob.name" link="gi-GITypelib.html#AttributeBlob.name"/>
+    <keyword type="member" name="AttributeBlob.value" link="gi-GITypelib.html#AttributeBlob.value"/>
+    <keyword type="member" name="GIFunctionInvoker.cif" link="gi-girffi.html#GIFunctionInvoker.cif"/>
+    <keyword type="member" name="GIFunctionInvoker.native-address" link="gi-girffi.html#GIFunctionInvoker.native-address"/>
   </functions>
 </book>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIArgInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIArgInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIArgInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIArgInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIArgInfo.html#g-arg-info-get-closure" title="g_arg_info_get_closure ()">g_arg_info_get_closure</a> <span class="c_punctuation">()</span>
@@ -55,7 +55,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIArgInfo.html#g-arg-info-get-destroy" title="g_arg_info_get_destroy ()">g_arg_info_get_destroy</a> <span class="c_punctuation">()</span>
@@ -103,7 +103,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIArgInfo.html#g-arg-info-may-be-null" title="g_arg_info_may_be_null ()">g_arg_info_may_be_null</a> <span class="c_punctuation">()</span>
@@ -111,7 +111,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIArgInfo.html#g-arg-info-is-caller-allocates" title="g_arg_info_is_caller_allocates ()">g_arg_info_is_caller_allocates</a> <span class="c_punctuation">()</span>
@@ -119,7 +119,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIArgInfo.html#g-arg-info-is-optional" title="g_arg_info_is_optional ()">g_arg_info_is_optional</a> <span class="c_punctuation">()</span>
@@ -127,7 +127,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIArgInfo.html#g-arg-info-is-return-value" title="g_arg_info_is_return_value ()">g_arg_info_is_return_value</a> <span class="c_punctuation">()</span>
@@ -135,7 +135,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIArgInfo.html#g-arg-info-is-skip" title="g_arg_info_is_skip ()">g_arg_info_is_skip</a> <span class="c_punctuation">()</span>
@@ -209,7 +209,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-arg-info-get-closure"></a><h3>g_arg_info_get_closure ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_arg_info_get_closure (<em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the index of the user data argument. This is only valid
 for arguments which are callbacks.</p>
@@ -236,9 +236,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-arg-info-get-destroy"></a><h3>g_arg_info_get_destroy ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_arg_info_get_destroy (<em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *info</code></em>);</pre>
-<p>Obtains the index of the <a href="https://developer.gnome.org/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> argument. This is only valid
+<p>Obtains the index of the <span class="type">GDestroyNotify</span> argument. This is only valid
 for arguments which are callbacks.</p>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.4.5"></a><h4>Parameters</h4>
@@ -257,7 +257,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.4.6"></a><h4>Returns</h4>
-<p> index of the <a href="https://developer.gnome.org/glib/unstable/glib-Datasets.html#GDestroyNotify"><span class="type">GDestroyNotify</span></a> argument or -1 if there is none</p>
+<p> index of the <span class="type">GDestroyNotify</span> argument or -1 if there is none</p>
 </div>
 </div>
 <hr>
@@ -414,11 +414,11 @@
 <hr>
 <div class="refsect2">
 <a name="g-arg-info-may-be-null"></a><h3>g_arg_info_may_be_null ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_arg_info_may_be_null (<em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *info</code></em>);</pre>
-<p>Obtain if the type of the argument includes the possibility of <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.
-For 'in' values this means that <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> is a valid value.  For 'out'
-values, this means that <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> may be returned.</p>
+<p>Obtain if the type of the argument includes the possibility of <code class="literal">NULL</code>.
+For 'in' values this means that <code class="literal">NULL</code> is a valid value.  For 'out'
+values, this means that <code class="literal">NULL</code> may be returned.</p>
 <p>See also <a class="link" href="gi-GIArgInfo.html#g-arg-info-is-optional" title="g_arg_info_is_optional ()"><code class="function">g_arg_info_is_optional()</code></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.10.6"></a><h4>Parameters</h4>
@@ -437,18 +437,18 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.10.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the value may be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> <code class="literal">TRUE</code> if the value may be <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-arg-info-is-caller-allocates"></a><h3>g_arg_info_is_caller_allocates ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_arg_info_is_caller_allocates (<em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if the argument is a pointer to a struct or object that will
 receive an output of a function.  The default assumption for
 <a class="link" href="gi-GIArgInfo.html#GI-DIRECTION-OUT:CAPS"><code class="literal">GI_DIRECTION_OUT</code></a> arguments which have allocation is that the
-callee allocates; if this is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, then the caller must allocate.</p>
+callee allocates; if this is <code class="literal">TRUE</code>, then the caller must allocate.</p>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -466,16 +466,16 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.11.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if caller is required to have allocated the argument</p>
+<p> <code class="literal">TRUE</code> if caller is required to have allocated the argument</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-arg-info-is-optional"></a><h3>g_arg_info_is_optional ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_arg_info_is_optional (<em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if the argument is optional.  For 'out' arguments this means
-that you can pass <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> in order to ignore the result.</p>
+that you can pass <code class="literal">NULL</code> in order to ignore the result.</p>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.12.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -493,13 +493,13 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.12.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if it is an optional argument</p>
+<p> <code class="literal">TRUE</code> if it is an optional argument</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-arg-info-is-return-value"></a><h3>g_arg_info_is_return_value ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_arg_info_is_return_value (<em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if the argument is a return value. It can either be a
 parameter or a return value.</p>
@@ -520,13 +520,13 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.13.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if it is a return value</p>
+<p> <code class="literal">TRUE</code> if it is a return value</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-arg-info-is-skip"></a><h3>g_arg_info_is_skip ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_arg_info_is_skip (<em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if an argument is only useful in C.</p>
 <div class="refsect3">
@@ -546,7 +546,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.17.6.14.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if argument is only useful in C.</p>
+<p> <code class="literal">TRUE</code> if argument is only useful in C.</p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-1-29-0.html#api-index-1.29.0">1.29.0</a></p>
 </div>
@@ -686,7 +686,7 @@
 <p>transfer the container (list, array, hash table) from
 the callee to the caller. The callee retains the ownership of the individual
 items in the container and the caller has to free up the container resources
-(<a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free"><code class="function">g_list_free()</code></a>/<a href="https://developer.gnome.org/glib/unstable/glib-Hash-Tables.html#g-hash-table-destroy"><code class="function">g_hash_table_destroy()</code></a> etc) of this transfer.</p>
+(<code class="function">g_list_free()</code>/<code class="function">g_hash_table_destroy()</code> etc) of this transfer.</p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIBaseInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIBaseInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIBaseInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIBaseInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -65,7 +65,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-equal" title="g_base_info_equal ()">g_base_info_equal</a> <span class="c_punctuation">()</span>
@@ -88,21 +88,21 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-get-namespace" title="g_base_info_get_namespace ()">g_base_info_get_namespace</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-get-name" title="g_base_info_get_name ()">g_base_info_get_name</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-get-attribute" title="g_base_info_get_attribute ()">g_base_info_get_attribute</a> <span class="c_punctuation">()</span>
@@ -110,7 +110,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-iterate-attributes" title="g_base_info_iterate_attributes ()">g_base_info_iterate_attributes</a> <span class="c_punctuation">()</span>
@@ -126,7 +126,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-is-deprecated" title="g_base_info_is_deprecated ()">g_base_info_is_deprecated</a> <span class="c_punctuation">()</span>
@@ -188,7 +188,7 @@
         <td class="listing_lines" align="right"><pre>1
 2
 3</pre></td>
-        <td class="listing_code"><pre class="programlisting"><span class="usertype">GIBaseInfo</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">button_info </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GIRepository.html#g-irepository-find-by-name">g_irepository_find_by_name</a></span><span class="symbol">(</span><span class="normal"><a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS">NULL</a></span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Gtk"</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Button"</span><span class="symbol">);</span>
+        <td class="listing_code"><pre class="programlisting"><span class="usertype">GIBaseInfo</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">button_info </span><span class="symbol">=</span><span class="normal"> </span><span class="function"><a href="GIRepository.html#g-irepository-find-by-name">g_irepository_find_by_name</a></span><span class="symbol">(</span><span class="normal">NULL</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Gtk"</span><span class="symbol">,</span><span class="normal"> </span><span class="string">"Button"</span><span class="symbol">);</span>
 <span class="symbol">...</span><span class="normal"> </span><span class="usertype">use</span><span class="normal"> button_info </span><span class="symbol">...</span>
 <span class="function"><a href="gi-GIBaseInfo.html#g-base-info-unref">g_base_info_unref</a></span><span class="symbol">(</span><span class="normal">button_info</span><span class="symbol">);</span></pre></td>
       </tr>
@@ -219,7 +219,7 @@
 g_info_new (<em class="parameter"><code><a class="link" href="gi-GIBaseInfo.html#GIInfoType" title="enum GIInfoType"><span class="type">GIInfoType</span></a> type</code></em>,
             <em class="parameter"><code><span class="type">GIBaseInfo</span> *container</code></em>,
             <em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
-            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> offset</code></em>);</pre>
+            <em class="parameter"><code><span class="type">guint32</span> offset</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.2.5.6.2.5"></a><h4>Parameters</h4>
@@ -315,7 +315,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-base-info-equal"></a><h3>g_base_info_equal ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_base_info_equal (<em class="parameter"><code><span class="type">GIBaseInfo</span> *info1</code></em>,
                    <em class="parameter"><code><span class="type">GIBaseInfo</span> *info2</code></em>);</pre>
 <p>Compare two <span class="type">GIBaseInfo</span>.</p>
@@ -346,7 +346,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.5.6.5.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if and only if <em class="parameter"><code>info1</code></em>
+<p> <code class="literal">TRUE</code> if and only if <em class="parameter"><code>info1</code></em>
 equals <em class="parameter"><code>info2</code></em>
 .</p>
 </div>
@@ -409,7 +409,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-base-info-get-namespace"></a><h3>g_base_info_get_namespace ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_base_info_get_namespace (<em class="parameter"><code><span class="type">GIBaseInfo</span> *info</code></em>);</pre>
 <p>Obtain the namespace of <em class="parameter"><code>info</code></em>
 .</p>
@@ -436,7 +436,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-base-info-get-name"></a><h3>g_base_info_get_name ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_base_info_get_name (<em class="parameter"><code><span class="type">GIBaseInfo</span> *info</code></em>);</pre>
 <p>Obtain the name of the <em class="parameter"><code>info</code></em>
 . What the name represents depends on
@@ -461,15 +461,15 @@
 <div class="refsect3">
 <a name="id-1.4.2.5.6.9.6"></a><h4>Returns</h4>
 <p> the name of <em class="parameter"><code>info</code></em>
-or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if it lacks a name.</p>
+or <code class="literal">NULL</code> if it lacks a name.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-base-info-get-attribute"></a><h3>g_base_info_get_attribute ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_base_info_get_attribute (<em class="parameter"><code><span class="type">GIBaseInfo</span> *info</code></em>,
-                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                           <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Retrieve an arbitrary attribute associated with this node.</p>
 <div class="refsect3">
 <a name="id-1.4.2.5.6.10.5"></a><h4>Parameters</h4>
@@ -495,20 +495,20 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.5.6.10.6"></a><h4>Returns</h4>
-<p> The value of the attribute, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no such attribute exists</p>
+<p> The value of the attribute, or <code class="literal">NULL</code> if no such attribute exists</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-base-info-iterate-attributes"></a><h3>g_base_info_iterate_attributes ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_base_info_iterate_attributes (<em class="parameter"><code><span class="type">GIBaseInfo</span> *info</code></em>,
                                 <em class="parameter"><code><a class="link" href="gi-GIBaseInfo.html#GIAttributeIter" title="GIAttributeIter"><span class="type">GIAttributeIter</span></a> *iterator</code></em>,
                                 <em class="parameter"><code><span class="type">char</span> **name</code></em>,
                                 <em class="parameter"><code><span class="type">char</span> **value</code></em>);</pre>
 <p>Iterate over all attributes associated with this node.  The iterator
 structure is typically stack allocated, and must have its first
-member initialized to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.  Attributes are arbitrary namespaced key–value
+member initialized to <code class="literal">NULL</code>.  Attributes are arbitrary namespaced key–value
 pairs which can be attached to almost any item.  They are intended for use
 by software higher in the toolchain than bindings, and are distinct from
 normal GIR annotations.</p>
@@ -541,7 +541,7 @@
 <span class="normal">  </span><span class="type">char</span><span class="normal"> </span><span class="symbol">*</span><span class="normal">value</span><span class="symbol">;</span>
 <span class="normal">  </span><span class="keyword">while</span><span class="normal"> </span><span class="symbol">(</span><span class="function"><a href="gi-GIBaseInfo.html#g-base-info-iterate-attributes">g_base_info_iterate_attributes</a></span><span class="normal"> </span><span class="symbol">(</span><span class="normal">info</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">iter</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">name</span><span class="symbol">,</span><span class="normal"> </span><span class="symbol">&amp;</span><span class="normal">value</span><span class="symbol">))</span>
 <span class="normal">    </span><span class="cbracket">{</span>
-<span class="normal">      </span><span class="function"><a href="https://developer.gnome.org/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span><span class="normal"> </span><span class="symbol">(</span><span class="string">"attribute name: %s value: %s"</span><span class="symbol">,</span><span class="normal"> name</span><span class="symbol">,</span><span class="normal"> value</span><span class="symbol">);</span>
+<span class="normal">      </span><span class="function">g_print</span><span class="normal"> </span><span class="symbol">(</span><span class="string">"attribute name: %s value: %s"</span><span class="symbol">,</span><span class="normal"> name</span><span class="symbol">,</span><span class="normal"> value</span><span class="symbol">);</span>
 <span class="normal">    </span><span class="cbracket">}</span>
 <span class="cbracket">}</span></pre></td>
       </tr>
@@ -584,7 +584,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.5.6.11.8"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if there are more attributes</p>
+<p> <code class="literal">TRUE</code> if there are more attributes</p>
 </div>
 </div>
 <hr>
@@ -620,7 +620,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-base-info-is-deprecated"></a><h3>g_base_info_is_deprecated ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_base_info_is_deprecated (<em class="parameter"><code><span class="type">GIBaseInfo</span> *info</code></em>);</pre>
 <p>Obtain whether the <em class="parameter"><code>info</code></em>
  is represents a metadata which is
@@ -642,7 +642,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.5.6.13.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if deprecated</p>
+<p> <code class="literal">TRUE</code> if deprecated</p>
 </div>
 </div>
 </div>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GICallableInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GICallableInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GICallableInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GICallableInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-can-throw-gerror" title="g_callable_info_can_throw_gerror ()">g_callable_info_can_throw_gerror</a> <span class="c_punctuation">()</span>
@@ -55,7 +55,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-get-n-args" title="g_callable_info_get_n_args ()">g_callable_info_get_n_args</a> <span class="c_punctuation">()</span>
@@ -78,7 +78,7 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-get-return-attribute" title="g_callable_info_get_return_attribute ()">g_callable_info_get_return_attribute</a> <span class="c_punctuation">()</span>
@@ -94,7 +94,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-invoke" title="g_callable_info_invoke ()">g_callable_info_invoke</a> <span class="c_punctuation">()</span>
@@ -102,7 +102,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-is-method" title="g_callable_info_is_method ()">g_callable_info_is_method</a> <span class="c_punctuation">()</span>
@@ -110,7 +110,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-iterate-return-attributes" title="g_callable_info_iterate_return_attributes ()">g_callable_info_iterate_return_attributes</a> <span class="c_punctuation">()</span>
@@ -134,7 +134,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-may-return-null" title="g_callable_info_may_return_null ()">g_callable_info_may_return_null</a> <span class="c_punctuation">()</span>
@@ -142,7 +142,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GICallableInfo.html#g-callable-info-skip-return" title="g_callable_info_skip_return ()">g_callable_info_skip_return</a> <span class="c_punctuation">()</span>
@@ -208,7 +208,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-can-throw-gerror"></a><h3>g_callable_info_can_throw_gerror ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_callable_info_can_throw_gerror (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
@@ -228,14 +228,14 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.3.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if this <a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> can throw a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p>
+<p> <code class="literal">TRUE</code> if this <a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> can throw a <span class="type">GError</span></p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-1-34.html#api-index-1.34">1.34</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-get-n-args"></a><h3>g_callable_info_get_n_args ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_callable_info_get_n_args (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of arguments (both IN and OUT) for this callable.</p>
 <div class="refsect3">
@@ -263,7 +263,7 @@
 <a name="g-callable-info-get-arg"></a><h3>g_callable_info_get_arg ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="returnvalue">GIArgInfo</span></a> *
 g_callable_info_get_arg (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain information about a particular argument of this callable.</p>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.5.5"></a><h4>Parameters</h4>
@@ -318,15 +318,15 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.6.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the caller owns the return value, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise.</p>
+<p> <code class="literal">TRUE</code> if the caller owns the return value, <code class="literal">FALSE</code> otherwise.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-get-return-attribute"></a><h3>g_callable_info_get_return_attribute ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_callable_info_get_return_attribute (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>,
-                                      <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                                      <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Retrieve an arbitrary attribute associated with the return value.</p>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.7.5"></a><h4>Parameters</h4>
@@ -352,7 +352,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.7.6"></a><h4>Returns</h4>
-<p> The value of the attribute, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if no such attribute exists</p>
+<p> The value of the attribute, or <code class="literal">NULL</code> if no such attribute exists</p>
 </div>
 </div>
 <hr>
@@ -386,17 +386,17 @@
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-invoke"></a><h3>g_callable_info_invoke ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_callable_info_invoke (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> function</code></em>,
+                        <em class="parameter"><code><span class="type">gpointer</span> function</code></em>,
                         <em class="parameter"><code>const <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *in_args</code></em>,
                         <em class="parameter"><code><span class="type">int</span> n_in_args</code></em>,
                         <em class="parameter"><code>const <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *out_args</code></em>,
                         <em class="parameter"><code><span class="type">int</span> n_out_args</code></em>,
                         <em class="parameter"><code><a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *return_value</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> is_method</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> throws</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                        <em class="parameter"><code><span class="type">gboolean</span> is_method</code></em>,
+                        <em class="parameter"><code><span class="type">gboolean</span> throws</code></em>,
+                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.9.5"></a><h4>Parameters</h4>
@@ -464,7 +464,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-is-method"></a><h3>g_callable_info_is_method ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_callable_info_is_method (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>);</pre>
 <p>Determines if the callable info is a method. For <a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a>s,
 <a class="link" href="gi-GICallbackInfo.html#GICallbackInfo" title="GICallbackInfo"><span class="type">GICallbackInfo</span></a>s, and <a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="type">GISignalInfo</span></a>s,
@@ -491,15 +491,15 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.10.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if <em class="parameter"><code>info</code></em>
-is a method, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+<p> <code class="literal">TRUE</code> if <em class="parameter"><code>info</code></em>
+is a method, <code class="literal">FALSE</code> otherwise</p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-1-34.html#api-index-1.34">1.34</a></p>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-iterate-return-attributes"></a><h3>g_callable_info_iterate_return_attributes ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_callable_info_iterate_return_attributes
                                (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>,
                                 <em class="parameter"><code><a class="link" href="gi-GIBaseInfo.html#GIAttributeIter" title="GIAttributeIter"><span class="type">GIAttributeIter</span></a> *iterator</code></em>,
@@ -507,7 +507,7 @@
                                 <em class="parameter"><code><span class="type">char</span> **value</code></em>);</pre>
 <p>Iterate over all attributes associated with the return value.  The
 iterator structure is typically stack allocated, and must have its
-first member initialized to <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</p>
+first member initialized to <code class="literal">NULL</code>.</p>
 <p>Both the <em class="parameter"><code>name</code></em>
  and <em class="parameter"><code>value</code></em>
  should be treated as constants
@@ -548,7 +548,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.11.8"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if there are more attributes</p>
+<p> <code class="literal">TRUE</code> if there are more attributes</p>
 </div>
 </div>
 <hr>
@@ -556,7 +556,7 @@
 <a name="g-callable-info-load-arg"></a><h3>g_callable_info_load_arg ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
 g_callable_info_load_arg (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>,
+                          <em class="parameter"><code><span class="type">gint</span> n</code></em>,
                           <em class="parameter"><code><a class="link" href="gi-GIArgInfo.html#GIArgInfo" title="GIArgInfo"><span class="type">GIArgInfo</span></a> *arg</code></em>);</pre>
 <p>Obtain information about a particular argument of this callable; this
 function is a variant of <a class="link" href="gi-GICallableInfo.html#g-callable-info-get-arg" title="g_callable_info_get_arg ()"><code class="function">g_callable_info_get_arg()</code></a> designed for stack
@@ -632,9 +632,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-may-return-null"></a><h3>g_callable_info_may_return_null ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_callable_info_may_return_null (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>);</pre>
-<p>See if a callable could return <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</p>
+<p>See if a callable could return <code class="literal">NULL</code>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.14.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -652,13 +652,13 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.14.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if callable could return <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> <code class="literal">TRUE</code> if callable could return <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-callable-info-skip-return"></a><h3>g_callable_info_skip_return ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_callable_info_skip_return (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>);</pre>
 <p>See if a callable's return value is only useful in C.</p>
 <div class="refsect3">
@@ -678,7 +678,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.6.6.15.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if return value is only useful in C.</p>
+<p> <code class="literal">TRUE</code> if return value is only useful in C.</p>
 </div>
 </div>
 </div>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIConstantInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIConstantInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIConstantInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIConstantInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -63,7 +63,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIConstantInfo.html#g-constant-info-get-value" title="g_constant_info_get_value ()">g_constant_info_get_value</a> <span class="c_punctuation">()</span>
@@ -184,7 +184,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-constant-info-get-value"></a><h3>g_constant_info_get_value ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_constant_info_get_value (<em class="parameter"><code><a class="link" href="gi-GIConstantInfo.html#GIConstantInfo" title="GIConstantInfo"><span class="type">GIConstantInfo</span></a> *info</code></em>,
                            <em class="parameter"><code><a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *value</code></em>);</pre>
 <p>Obtain the value associated with the <a class="link" href="gi-GIConstantInfo.html#GIConstantInfo" title="GIConstantInfo"><span class="type">GIConstantInfo</span></a> and store it in the
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIEnumInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIEnumInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIEnumInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIEnumInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -53,7 +53,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIEnumInfo.html#g-enum-info-get-n-values" title="g_enum_info_get_n_values ()">g_enum_info_get_n_values</a> <span class="c_punctuation">()</span>
@@ -69,7 +69,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIEnumInfo.html#g-enum-info-get-n-methods" title="g_enum_info_get_n_methods ()">g_enum_info_get_n_methods</a> <span class="c_punctuation">()</span>
@@ -92,7 +92,7 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIEnumInfo.html#g-enum-info-get-error-domain" title="g_enum_info_get_error_domain ()">g_enum_info_get_error_domain</a> <span class="c_punctuation">()</span>
@@ -100,7 +100,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+<span class="returnvalue">gint64</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIEnumInfo.html#g-value-info-get-value" title="g_value_info_get_value ()">g_value_info_get_value</a> <span class="c_punctuation">()</span>
@@ -184,7 +184,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-enum-info-get-n-values"></a><h3>g_enum_info_get_n_values ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_enum_info_get_n_values (<em class="parameter"><code><a class="link" href="gi-GIEnumInfo.html#GIEnumInfo" title="GIEnumInfo"><span class="type">GIEnumInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of values this enumeration contains.</p>
 <div class="refsect3">
@@ -212,7 +212,7 @@
 <a name="g-enum-info-get-value"></a><h3>g_enum_info_get_value ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIValueInfo.html#GIValueInfo" title="GIValueInfo"><span class="returnvalue">GIValueInfo</span></a> *
 g_enum_info_get_value (<em class="parameter"><code><a class="link" href="gi-GIEnumInfo.html#GIEnumInfo" title="GIEnumInfo"><span class="type">GIEnumInfo</span></a> *info</code></em>,
-                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                       <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain a value for this enumeration.</p>
 <div class="refsect3">
 <a name="id-1.4.2.12.6.5.5"></a><h4>Parameters</h4>
@@ -238,7 +238,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.12.6.5.6"></a><h4>Returns</h4>
-<p> the enumeration value or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if type tag is wrong,
+<p> the enumeration value or <code class="literal">NULL</code> if type tag is wrong,
 free the struct with <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -246,7 +246,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-enum-info-get-n-methods"></a><h3>g_enum_info_get_n_methods ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_enum_info_get_n_methods (<em class="parameter"><code><a class="link" href="gi-GIEnumInfo.html#GIEnumInfo" title="GIEnumInfo"><span class="type">GIEnumInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of methods that this enum type has.</p>
 <div class="refsect3">
@@ -275,7 +275,7 @@
 <a name="g-enum-info-get-method"></a><h3>g_enum_info_get_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_enum_info_get_method (<em class="parameter"><code><a class="link" href="gi-GIEnumInfo.html#GIEnumInfo" title="GIEnumInfo"><span class="type">GIEnumInfo</span></a> *info</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                        <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an enum type method at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -341,7 +341,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-enum-info-get-error-domain"></a><h3>g_enum_info_get_error_domain ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_enum_info_get_error_domain (<em class="parameter"><code><a class="link" href="gi-GIEnumInfo.html#GIEnumInfo" title="GIEnumInfo"><span class="type">GIEnumInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the string form of the quark for the error domain associated with
 this enum, if any.</p>
@@ -363,7 +363,7 @@
 <div class="refsect3">
 <a name="id-1.4.2.12.6.9.6"></a><h4>Returns</h4>
 <p> the string form of the error domain associated
-with this enum, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
+with this enum, or <code class="literal">NULL</code>. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-1-29-17.html#api-index-1.29.17">1.29.17</a></p>
@@ -371,7 +371,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-value-info-get-value"></a><h3>g_value_info_get_value ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint64"><span class="returnvalue">gint64</span></a>
+<pre class="programlisting"><span class="returnvalue">gint64</span>
 g_value_info_get_value (<em class="parameter"><code><a class="link" href="gi-GIValueInfo.html#GIValueInfo" title="GIValueInfo"><span class="type">GIValueInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the enumeration value of the <a class="link" href="gi-GIValueInfo.html#GIValueInfo" title="GIValueInfo"><span class="type">GIValueInfo</span></a>.</p>
 <div class="refsect3">
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIFieldInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIFieldInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIFieldInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIFieldInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIFieldInfo.html#g-field-info-get-field" title="g_field_info_get_field ()">g_field_info_get_field</a> <span class="c_punctuation">()</span>
@@ -55,7 +55,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIFieldInfo.html#g-field-info-set-field" title="g_field_info_set_field ()">g_field_info_set_field</a> <span class="c_punctuation">()</span>
@@ -71,7 +71,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIFieldInfo.html#g-field-info-get-offset" title="g_field_info_get_offset ()">g_field_info_get_offset</a> <span class="c_punctuation">()</span>
@@ -79,7 +79,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIFieldInfo.html#g-field-info-get-size" title="g_field_info_get_size ()">g_field_info_get_size</a> <span class="c_punctuation">()</span>
@@ -157,9 +157,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-field-info-get-field"></a><h3>g_field_info_get_field ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_field_info_get_field (<em class="parameter"><code><a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="type">GIFieldInfo</span></a> *field_info</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> mem</code></em>,
+                        <em class="parameter"><code><span class="type">gpointer</span> mem</code></em>,
                         <em class="parameter"><code><a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *value</code></em>);</pre>
 <p>Reads a field identified by a <a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="type">GIFieldInfo</span></a> from a C structure or
 union.  This only handles fields of simple C types. It will fail
@@ -195,15 +195,15 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.19.6.3.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if reading the field succeeded, otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a></p>
+<p> <code class="literal">TRUE</code> if reading the field succeeded, otherwise <code class="literal">FALSE</code></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-field-info-set-field"></a><h3>g_field_info_set_field ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_field_info_set_field (<em class="parameter"><code><a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="type">GIFieldInfo</span></a> *field_info</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> mem</code></em>,
+                        <em class="parameter"><code><span class="type">gpointer</span> mem</code></em>,
                         <em class="parameter"><code>const <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *value</code></em>);</pre>
 <p>Writes a field identified by a <a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="type">GIFieldInfo</span></a> to a C structure or
 union.  This only handles fields of simple C types. It will fail
@@ -241,7 +241,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.19.6.4.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if writing the field succeeded, otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a></p>
+<p> <code class="literal">TRUE</code> if writing the field succeeded, otherwise <code class="literal">FALSE</code></p>
 </div>
 </div>
 <hr>
@@ -274,7 +274,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-field-info-get-offset"></a><h3>g_field_info_get_offset ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_field_info_get_offset (<em class="parameter"><code><a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="type">GIFieldInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the offset in bits of the field member, this is relative
 to the beginning of the struct or union.</p>
@@ -301,7 +301,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-field-info-get-size"></a><h3>g_field_info_get_size ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_field_info_get_size (<em class="parameter"><code><a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="type">GIFieldInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the size in bits of the field member, this is how
 much space you need to allocate to store the field.</p>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIFunctionInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIFunctionInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIFunctionInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIFunctionInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -62,7 +62,7 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIFunctionInfo.html#g-function-info-get-symbol" title="g_function_info_get_symbol ()">g_function_info_get_symbol</a> <span class="c_punctuation">()</span>
@@ -78,7 +78,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIFunctionInfo.html#g-function-info-invoke" title="g_function_info_invoke ()">g_function_info_invoke</a> <span class="c_punctuation">()</span>
@@ -90,7 +90,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>
+<span class="returnvalue">GQuark</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIFunctionInfo.html#g-invoke-error-quark" title="g_invoke_error_quark ()">g_invoke_error_quark</a> <span class="c_punctuation">()</span>
@@ -198,7 +198,7 @@
 <p>Obtain the property associated with this <a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a>.
 Only <a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> with the flag <a class="link" href="gi-GIFunctionInfo.html#GI-FUNCTION-IS-GETTER:CAPS"><code class="literal">GI_FUNCTION_IS_GETTER</code></a> or
 <a class="link" href="gi-GIFunctionInfo.html#GI-FUNCTION-IS-SETTER:CAPS"><code class="literal">GI_FUNCTION_IS_SETTER</code></a> have a property set. For other cases,
-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be returned.</p>
+<code class="literal">NULL</code> will be returned.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -216,7 +216,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.7.6.4.6"></a><h4>Returns</h4>
-<p> the property or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not set. Free it with
+<p> the property or <code class="literal">NULL</code> if not set. Free it with
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -224,11 +224,11 @@
 <hr>
 <div class="refsect2">
 <a name="g-function-info-get-symbol"></a><h3>g_function_info_get_symbol ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_function_info_get_symbol (<em class="parameter"><code><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the symbol of the function. The symbol is the name of the
 exported function, suitable to be used as an argument to
-<a href="https://developer.gnome.org/glib/unstable/glib-Dynamic-Loading-of-Modules.html#g-module-symbol"><code class="function">g_module_symbol()</code></a>.</p>
+<code class="function">g_module_symbol()</code>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.6.5.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -256,7 +256,7 @@
 g_function_info_get_vfunc (<em class="parameter"><code><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the virtual function associated with this <a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a>.
 Only <a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> with the flag <a class="link" href="gi-GIFunctionInfo.html#GI-FUNCTION-WRAPS-VFUNC:CAPS"><code class="literal">GI_FUNCTION_WRAPS_VFUNC</code></a> has
-a virtual function set. For other cases, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be returned.</p>
+a virtual function set. For other cases, <code class="literal">NULL</code> will be returned.</p>
 <div class="refsect3">
 <a name="id-1.4.2.7.6.6.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -274,7 +274,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.7.6.6.6"></a><h4>Returns</h4>
-<p> the virtual function or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not set.
+<p> the virtual function or <code class="literal">NULL</code> if not set.
 Free it by calling <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -282,21 +282,21 @@
 <hr>
 <div class="refsect2">
 <a name="g-function-info-invoke"></a><h3>g_function_info_invoke ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_function_info_invoke (<em class="parameter"><code><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> *info</code></em>,
                         <em class="parameter"><code>const <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *in_args</code></em>,
                         <em class="parameter"><code><span class="type">int</span> n_in_args</code></em>,
                         <em class="parameter"><code>const <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *out_args</code></em>,
                         <em class="parameter"><code><span class="type">int</span> n_out_args</code></em>,
                         <em class="parameter"><code><a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *return_value</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                        <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Invokes the function described in <em class="parameter"><code>info</code></em>
  with the given
 arguments. Note that inout parameters must appear in both
 argument lists. This function uses <code class="function">dlsym()</code> to obtain a pointer
 to the function, so the library or shared object containing the
 described function must either be linked to the caller, or must
-have been <a href="https://developer.gnome.org/glib/unstable/glib-Dynamic-Loading-of-Modules.html#g-module-symbol"><code class="function">g_module_symbol()</code></a>ed before calling this function.</p>
+have been <code class="function">g_module_symbol()</code>ed before calling this function.</p>
 <p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
 <a name="id-1.4.2.7.6.7.6"></a><h4>Parameters</h4>
@@ -317,7 +317,7 @@
 <td class="parameter_description"><p>an array of <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a>s, one for each in
 parameter of <em class="parameter"><code>info</code></em>
 . If there are no in parameter, <em class="parameter"><code>in_args</code></em>
-can be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+can be <code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -331,7 +331,7 @@
 <td class="parameter_description"><p>an array of <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a>s, one for each out
 parameter of <em class="parameter"><code>info</code></em>
 . If there are no out parameters, <em class="parameter"><code>out_args</code></em>
-may be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+may be <code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -345,12 +345,12 @@
 <td class="parameter_description"><p>return location for the return value of the
 function. If the function returns void, <em class="parameter"><code>return_value</code></em>
 may be
-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for detailed error information, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_description"><p>return location for detailed error information, or <code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -358,7 +358,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.7.6.7.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the function has been invoked, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an
+<p> <code class="literal">TRUE</code> if the function has been invoked, <code class="literal">FALSE</code> if an
 error occurred.</p>
 </div>
 </div>
@@ -372,7 +372,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-invoke-error-quark"></a><h3>g_invoke_error_quark ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>
+<pre class="programlisting"><span class="returnvalue">GQuark</span>
 g_invoke_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIInterfaceInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIInterfaceInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIInterfaceInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIInterfaceInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIInterfaceInfo.html#g-interface-info-get-n-prerequisites" title="g_interface_info_get_n_prerequisites ()">g_interface_info_get_n_prerequisites</a> <span class="c_punctuation">()</span>
@@ -63,7 +63,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIInterfaceInfo.html#g-interface-info-get-n-properties" title="g_interface_info_get_n_properties ()">g_interface_info_get_n_properties</a> <span class="c_punctuation">()</span>
@@ -79,7 +79,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIInterfaceInfo.html#g-interface-info-get-n-methods" title="g_interface_info_get_n_methods ()">g_interface_info_get_n_methods</a> <span class="c_punctuation">()</span>
@@ -103,7 +103,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIInterfaceInfo.html#g-interface-info-get-n-signals" title="g_interface_info_get_n_signals ()">g_interface_info_get_n_signals</a> <span class="c_punctuation">()</span>
@@ -127,7 +127,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIInterfaceInfo.html#g-interface-info-get-n-vfuncs" title="g_interface_info_get_n_vfuncs ()">g_interface_info_get_n_vfuncs</a> <span class="c_punctuation">()</span>
@@ -151,7 +151,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIInterfaceInfo.html#g-interface-info-get-n-constants" title="g_interface_info_get_n_constants ()">g_interface_info_get_n_constants</a> <span class="c_punctuation">()</span>
@@ -191,7 +191,7 @@
 </div>
 <div class="refsect1">
 <a name="gi-GIInterfaceInfo.description"></a><h2>Description</h2>
-<p>GIInterfaceInfo represents a <a href="https://developer.gnome.org/gobject/unstable/GTypeModule.html"><span class="type">GInterface</span></a> type.</p>
+<p>GIInterfaceInfo represents a <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/GTypeModule.html"><span class="type">GInterface</span></a> type.</p>
 <p>A GInterface has methods, fields, properties, signals, interfaces, constants,
 virtual functions and prerequisites.</p>
 <div class="refsect1">
@@ -229,7 +229,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-interface-info-get-n-prerequisites"></a><h3>g_interface_info_get_n_prerequisites ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_interface_info_get_n_prerequisites (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of prerequisites for this interface type.
 A prerequisites is another interface that needs to be implemented for
@@ -259,7 +259,7 @@
 <a name="g-interface-info-get-prerequisite"></a><h3>g_interface_info_get_prerequisite ()</h3>
 <pre class="programlisting"><span class="returnvalue">GIBaseInfo</span> *
 g_interface_info_get_prerequisite (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                                   <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                                   <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an interface type prerequisites index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -294,7 +294,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-interface-info-get-n-properties"></a><h3>g_interface_info_get_n_properties ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_interface_info_get_n_properties (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of properties that this interface type has.</p>
 <div class="refsect3">
@@ -322,7 +322,7 @@
 <a name="g-interface-info-get-property"></a><h3>g_interface_info_get_property ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIPropertyInfo.html#GIPropertyInfo" title="GIPropertyInfo"><span class="returnvalue">GIPropertyInfo</span></a> *
 g_interface_info_get_property (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                               <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an interface type property at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -357,7 +357,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-interface-info-get-n-methods"></a><h3>g_interface_info_get_n_methods ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_interface_info_get_n_methods (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of methods that this interface type has.</p>
 <div class="refsect3">
@@ -385,7 +385,7 @@
 <a name="g-interface-info-get-method"></a><h3>g_interface_info_get_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_interface_info_get_method (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                             <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an interface type method at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -422,9 +422,9 @@
 <a name="g-interface-info-find-method"></a><h3>g_interface_info_find_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_interface_info_find_method (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                              <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                              <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Obtain a method of the interface type given a <em class="parameter"><code>name</code></em>
-. <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be
+. <code class="literal">NULL</code> will be
 returned if there's no method available with that name.</p>
 <div class="refsect3">
 <a name="id-1.4.2.16.6.9.5"></a><h4>Parameters</h4>
@@ -450,7 +450,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.16.6.9.6"></a><h4>Returns</h4>
-<p> the <a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none found.
+<p> the <a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> or <code class="literal">NULL</code> if none found.
 Free the struct by calling <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -458,7 +458,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-interface-info-get-n-signals"></a><h3>g_interface_info_get_n_signals ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_interface_info_get_n_signals (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of signals that this interface type has.</p>
 <div class="refsect3">
@@ -486,7 +486,7 @@
 <a name="g-interface-info-get-signal"></a><h3>g_interface_info_get_signal ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="returnvalue">GISignalInfo</span></a> *
 g_interface_info_get_signal (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                             <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an interface type signal at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -523,7 +523,7 @@
 <a name="g-interface-info-find-signal"></a><h3>g_interface_info_find_signal ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="returnvalue">GISignalInfo</span></a> *
 g_interface_info_find_signal (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                              <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                              <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.2.16.6.12.5"></a><h4>Parameters</h4>
@@ -552,7 +552,7 @@
 <p> Info for the signal with name <em class="parameter"><code>name</code></em>
 in <em class="parameter"><code>info</code></em>
 , or
-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure. </p>
+<code class="literal">NULL</code> on failure. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-1-34.html#api-index-1.34">1.34</a></p>
@@ -560,7 +560,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-interface-info-get-n-vfuncs"></a><h3>g_interface_info_get_n_vfuncs ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_interface_info_get_n_vfuncs (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of virtual functions that this interface type has.</p>
 <div class="refsect3">
@@ -588,7 +588,7 @@
 <a name="g-interface-info-get-vfunc"></a><h3>g_interface_info_get_vfunc ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="returnvalue">GIVFuncInfo</span></a> *
 g_interface_info_get_vfunc (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                            <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an interface type virtual function at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -625,7 +625,7 @@
 <a name="g-interface-info-find-vfunc"></a><h3>g_interface_info_find_vfunc ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="returnvalue">GIVFuncInfo</span></a> *
 g_interface_info_find_vfunc (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                             <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                             <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Locate a virtual function slot with name <em class="parameter"><code>name</code></em>
 . See the documentation
 for <a class="link" href="gi-GIObjectInfo.html#g-object-info-find-vfunc" title="g_object_info_find_vfunc ()"><code class="function">g_object_info_find_vfunc()</code></a> for more information on virtuals.</p>
@@ -653,7 +653,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.16.6.15.6"></a><h4>Returns</h4>
-<p> the <a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Free it with
+<p> the <a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a>, or <code class="literal">NULL</code>. Free it with
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -661,7 +661,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-interface-info-get-n-constants"></a><h3>g_interface_info_get_n_constants ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_interface_info_get_n_constants (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of constants that this interface type has.</p>
 <div class="refsect3">
@@ -689,7 +689,7 @@
 <a name="g-interface-info-get-constant"></a><h3>g_interface_info_get_constant ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIConstantInfo.html#GIConstantInfo" title="GIConstantInfo"><span class="returnvalue">GIConstantInfo</span></a> *
 g_interface_info_get_constant (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>,
-                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                               <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an interface type constant at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -726,7 +726,7 @@
 <a name="g-interface-info-get-iface-struct"></a><h3>g_interface_info_get_iface_struct ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="returnvalue">GIStructInfo</span></a> *
 g_interface_info_get_iface_struct (<em class="parameter"><code><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="type">GIInterfaceInfo</span></a> *info</code></em>);</pre>
-<p>Returns the layout C structure associated with this <a href="https://developer.gnome.org/gobject/unstable/GTypeModule.html"><span class="type">GInterface</span></a>.</p>
+<p>Returns the layout C structure associated with this <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/GTypeModule.html"><span class="type">GInterface</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.16.6.18.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -744,7 +744,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.16.6.18.6"></a><h4>Returns</h4>
-<p> the <a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Free it with
+<p> the <a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> or <code class="literal">NULL</code>. Free it with
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIObjectInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIObjectInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIObjectInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIObjectInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-abstract" title="g_object_info_get_abstract ()">g_object_info_get_abstract</a> <span class="c_punctuation">()</span>
@@ -55,7 +55,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-fundamental" title="g_object_info_get_fundamental ()">g_object_info_get_fundamental</a> <span class="c_punctuation">()</span>
@@ -70,14 +70,14 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-type-name" title="g_object_info_get_type_name ()">g_object_info_get_type_name</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-type-init" title="g_object_info_get_type_init ()">g_object_info_get_type_init</a> <span class="c_punctuation">()</span>
@@ -85,7 +85,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-n-constants" title="g_object_info_get_n_constants ()">g_object_info_get_n_constants</a> <span class="c_punctuation">()</span>
@@ -101,7 +101,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-n-fields" title="g_object_info_get_n_fields ()">g_object_info_get_n_fields</a> <span class="c_punctuation">()</span>
@@ -117,7 +117,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-n-interfaces" title="g_object_info_get_n_interfaces ()">g_object_info_get_n_interfaces</a> <span class="c_punctuation">()</span>
@@ -133,7 +133,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-n-methods" title="g_object_info_get_n_methods ()">g_object_info_get_n_methods</a> <span class="c_punctuation">()</span>
@@ -165,7 +165,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-n-properties" title="g_object_info_get_n_properties ()">g_object_info_get_n_properties</a> <span class="c_punctuation">()</span>
@@ -181,7 +181,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-n-signals" title="g_object_info_get_n_signals ()">g_object_info_get_n_signals</a> <span class="c_punctuation">()</span>
@@ -205,7 +205,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIObjectInfo.html#g-object-info-get-n-vfuncs" title="g_object_info_get_n_vfuncs ()">g_object_info_get_n_vfuncs</a> <span class="c_punctuation">()</span>
@@ -353,7 +353,7 @@
 </div>
 <div class="refsect1">
 <a name="gi-GIObjectInfo.description"></a><h2>Description</h2>
-<p>GIObjectInfo represents a <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a>. This doesn't represent a specific
+<p>GIObjectInfo represents a <span class="type">GObject</span>. This doesn't represent a specific
 instance of a GObject, instead this represent the object type (eg class).</p>
 <p>A GObject has methods, fields, properties, signals, interfaces, constants
 and virtual functions.</p>
@@ -392,7 +392,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-abstract"></a><h3>g_object_info_get_abstract ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_object_info_get_abstract (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if the object type is an abstract type, eg if it cannot be
 instantiated</p>
@@ -413,13 +413,13 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.3.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the object type is abstract</p>
+<p> <code class="literal">TRUE</code> if the object type is abstract</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-fundamental"></a><h3>g_object_info_get_fundamental ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_object_info_get_fundamental (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if the object type is of a fundamental type which is not
 G_TYPE_OBJECT. This is mostly for supporting GstMiniObject.</p>
@@ -440,7 +440,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.4.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the object type is a fundamental type</p>
+<p> <code class="literal">TRUE</code> if the object type is a fundamental type</p>
 </div>
 </div>
 <hr>
@@ -474,7 +474,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-type-name"></a><h3>g_object_info_get_type_name ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_object_info_get_type_name (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the name of the objects class/type.</p>
 <div class="refsect3">
@@ -500,7 +500,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-type-init"></a><h3>g_object_info_get_type_init ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_object_info_get_type_init (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the function which when called will return the GType
 function for which this object type is registered.</p>
@@ -527,7 +527,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-n-constants"></a><h3>g_object_info_get_n_constants ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_object_info_get_n_constants (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of constants that this object type has.</p>
 <div class="refsect3">
@@ -555,7 +555,7 @@
 <a name="g-object-info-get-constant"></a><h3>g_object_info_get_constant ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIConstantInfo.html#GIConstantInfo" title="GIConstantInfo"><span class="returnvalue">GIConstantInfo</span></a> *
 g_object_info_get_constant (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                            <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an object type constant at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -590,7 +590,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-n-fields"></a><h3>g_object_info_get_n_fields ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_object_info_get_n_fields (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of fields that this object type has.</p>
 <div class="refsect3">
@@ -618,7 +618,7 @@
 <a name="g-object-info-get-field"></a><h3>g_object_info_get_field ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="returnvalue">GIFieldInfo</span></a> *
 g_object_info_get_field (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an object type field at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -653,7 +653,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-n-interfaces"></a><h3>g_object_info_get_n_interfaces ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_object_info_get_n_interfaces (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of interfaces that this object type has.</p>
 <div class="refsect3">
@@ -681,7 +681,7 @@
 <a name="g-object-info-get-interface"></a><h3>g_object_info_get_interface ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIInterfaceInfo.html#GIInterfaceInfo" title="GIInterfaceInfo"><span class="returnvalue">GIInterfaceInfo</span></a> *
 g_object_info_get_interface (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                             <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an object type interface at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -716,7 +716,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-n-methods"></a><h3>g_object_info_get_n_methods ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_object_info_get_n_methods (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of methods that this object type has.</p>
 <div class="refsect3">
@@ -744,7 +744,7 @@
 <a name="g-object-info-get-method"></a><h3>g_object_info_get_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_object_info_get_method (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                          <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an object type method at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -781,9 +781,9 @@
 <a name="g-object-info-find-method"></a><h3>g_object_info_find_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_object_info_find_method (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                           <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Obtain a method of the object type given a <em class="parameter"><code>name</code></em>
-. <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be
+. <code class="literal">NULL</code> will be
 returned if there's no method available with that name.</p>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.16.5"></a><h4>Parameters</h4>
@@ -820,12 +820,12 @@
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_object_info_find_method_using_interfaces
                                (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
                                 <em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> **implementor</code></em>);</pre>
 <p>Obtain a method of the object given a <em class="parameter"><code>name</code></em>
 , searching both the
 object <em class="parameter"><code>info</code></em>
- and any interfaces it implements.  <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be
+ and any interfaces it implements.  <code class="literal">NULL</code> will be
 returned if there's no method available with that name.</p>
 <p>Note that this function does *not* search parent classes; you will have
 to chain up if that's desired.</p>
@@ -866,7 +866,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-n-properties"></a><h3>g_object_info_get_n_properties ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_object_info_get_n_properties (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of properties that this object type has.</p>
 <div class="refsect3">
@@ -894,7 +894,7 @@
 <a name="g-object-info-get-property"></a><h3>g_object_info_get_property ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIPropertyInfo.html#GIPropertyInfo" title="GIPropertyInfo"><span class="returnvalue">GIPropertyInfo</span></a> *
 g_object_info_get_property (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                            <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an object type property at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -929,7 +929,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-n-signals"></a><h3>g_object_info_get_n_signals ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_object_info_get_n_signals (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of signals that this object type has.</p>
 <div class="refsect3">
@@ -957,7 +957,7 @@
 <a name="g-object-info-get-signal"></a><h3>g_object_info_get_signal ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="returnvalue">GISignalInfo</span></a> *
 g_object_info_get_signal (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                          <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an object type signal at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -994,7 +994,7 @@
 <a name="g-object-info-find-signal"></a><h3>g_object_info_find_signal ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="returnvalue">GISignalInfo</span></a> *
 g_object_info_find_signal (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                           <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.22.5"></a><h4>Parameters</h4>
@@ -1022,14 +1022,14 @@
 <a name="id-1.4.2.15.6.22.6"></a><h4>Returns</h4>
 <p> Info for the signal with name <em class="parameter"><code>name</code></em>
 in <em class="parameter"><code>info</code></em>
-, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> on failure. </p>
+, or <code class="literal">NULL</code> on failure. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-object-info-get-n-vfuncs"></a><h3>g_object_info_get_n_vfuncs ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_object_info_get_n_vfuncs (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of virtual functions that this object type has.</p>
 <div class="refsect3">
@@ -1057,7 +1057,7 @@
 <a name="g-object-info-get-vfunc"></a><h3>g_object_info_get_vfunc ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="returnvalue">GIVFuncInfo</span></a> *
 g_object_info_get_vfunc (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain an object type virtual function at index <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -1094,12 +1094,12 @@
 <a name="g-object-info-find-vfunc"></a><h3>g_object_info_find_vfunc ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="returnvalue">GIVFuncInfo</span></a> *
 g_object_info_find_vfunc (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                          <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                          <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Locate a virtual function slot with name <em class="parameter"><code>name</code></em>
 . Note that the namespace
 for virtuals is distinct from that of methods; there may or may not be
 a concrete method associated for a virtual. If there is one, it may
-be retrieved using <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-get-invoker" title="g_vfunc_info_get_invoker ()"><code class="function">g_vfunc_info_get_invoker()</code></a>, otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be
+be retrieved using <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-get-invoker" title="g_vfunc_info_get_invoker ()"><code class="function">g_vfunc_info_get_invoker()</code></a>, otherwise <code class="literal">NULL</code> will be
 returned.
 See the documentation for <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-get-invoker" title="g_vfunc_info_get_invoker ()"><code class="function">g_vfunc_info_get_invoker()</code></a> for more
 information on invoking virtuals.</p>
@@ -1127,7 +1127,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.25.6"></a><h4>Returns</h4>
-<p> the <a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Free it with
+<p> the <a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a>, or <code class="literal">NULL</code>. Free it with
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -1138,7 +1138,7 @@
 <pre class="programlisting"><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="returnvalue">GIVFuncInfo</span></a> *
 g_object_info_find_vfunc_using_interfaces
                                (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>,
-                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>,
+                                <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>,
                                 <em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> **implementor</code></em>);</pre>
 <p>Locate a virtual function slot with name <em class="parameter"><code>name</code></em>
 , searching both the object
@@ -1146,7 +1146,7 @@
  and any interfaces it implements.  Note that the namespace for
 virtuals is distinct from that of methods; there may or may not be a
 concrete method associated for a virtual. If there is one, it may be
-retrieved using <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-get-invoker" title="g_vfunc_info_get_invoker ()"><code class="function">g_vfunc_info_get_invoker()</code></a>, otherwise <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be
+retrieved using <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-get-invoker" title="g_vfunc_info_get_invoker ()"><code class="function">g_vfunc_info_get_invoker()</code></a>, otherwise <code class="literal">NULL</code> will be
 returned.</p>
 <p>Note that this function does *not* search parent classes; you will have
 to chain up if that's desired.</p>
@@ -1189,7 +1189,7 @@
 <a name="g-object-info-get-class-struct"></a><h3>g_object_info_get_class_struct ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="returnvalue">GIStructInfo</span></a> *
 g_object_info_get_class_struct (<em class="parameter"><code><a class="link" href="gi-GIObjectInfo.html#GIObjectInfo" title="GIObjectInfo"><span class="type">GIObjectInfo</span></a> *info</code></em>);</pre>
-<p>Every <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> has two structures; an instance structure and a class
+<p>Every <span class="type">GObject</span> has two structures; an instance structure and a class
 structure.  This function returns the metadata for the class structure.</p>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.27.5"></a><h4>Parameters</h4>
@@ -1208,7 +1208,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.27.6"></a><h4>Returns</h4>
-<p> the <a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Free with
+<p> the <a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> or <code class="literal">NULL</code>. Free with
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -1239,7 +1239,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.28.6"></a><h4>Returns</h4>
-<p> the symbol or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the symbol or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1270,7 +1270,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.29.7"></a><h4>Returns</h4>
-<p> the function pointer or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the function pointer or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1299,7 +1299,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.30.6"></a><h4>Returns</h4>
-<p> the symbol or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the symbol or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1330,7 +1330,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.31.7"></a><h4>Returns</h4>
-<p> the function pointer or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the function pointer or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1360,7 +1360,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.32.6"></a><h4>Returns</h4>
-<p> the symbol or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the symbol or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1391,7 +1391,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.33.7"></a><h4>Returns</h4>
-<p> the function pointer or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the function pointer or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1421,7 +1421,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.34.6"></a><h4>Returns</h4>
-<p> the symbol or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the symbol or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1452,7 +1452,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.15.6.35.7"></a><h4>Returns</h4>
-<p> the function pointer or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p>
+<p> the function pointer or <code class="literal">NULL</code></p>
 </div>
 </div>
 <hr>
@@ -1510,7 +1510,7 @@
 <div class="refsect2">
 <a name="GIObjectInfoSetValueFunction"></a><h3>GIObjectInfoSetValueFunction ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-<span class="c_punctuation">(</span>*GIObjectInfoSetValueFunction<span class="c_punctuation">)</span> (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>,
+<span class="c_punctuation">(</span>*GIObjectInfoSetValueFunction<span class="c_punctuation">)</span> (<em class="parameter"><code><span class="type">GValue</span> *value</code></em>,
                                  <em class="parameter"><code><span class="type">void</span> *object</code></em>);</pre>
 <p>Update <em class="parameter"><code>value</code></em>
  and attach the object instance pointer <em class="parameter"><code>object</code></em>
@@ -1527,7 +1527,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a></p></td>
+<td class="parameter_description"><p>a <span class="type">GValue</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -1543,7 +1543,7 @@
 <div class="refsect2">
 <a name="GIObjectInfoGetValueFunction"></a><h3>GIObjectInfoGetValueFunction ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span> *
-<span class="c_punctuation">(</span>*GIObjectInfoGetValueFunction<span class="c_punctuation">)</span> (<em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *value</code></em>);</pre>
+<span class="c_punctuation">(</span>*GIObjectInfoGetValueFunction<span class="c_punctuation">)</span> (<em class="parameter"><code>const <span class="type">GValue</span> *value</code></em>);</pre>
 <p>Extract an object instance out of <em class="parameter"><code>value</code></em>
 </p>
 <p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
@@ -1557,7 +1557,7 @@
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>value</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a></p></td>
+<td class="parameter_description"><p>a <span class="type">GValue</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr></tbody>
 </table></div>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIPropertyInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIPropertyInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIPropertyInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIPropertyInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamFlags"><span class="returnvalue">GParamFlags</span></a>
+<span class="returnvalue">GParamFlags</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIPropertyInfo.html#g-property-info-get-flags" title="g_property_info_get_flags ()">g_property_info_get_flags</a> <span class="c_punctuation">()</span>
@@ -123,9 +123,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-property-info-get-flags"></a><h3>g_property_info_get_flags ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamFlags"><span class="returnvalue">GParamFlags</span></a>
+<pre class="programlisting"><span class="returnvalue">GParamFlags</span>
 g_property_info_get_flags (<em class="parameter"><code><a class="link" href="gi-GIPropertyInfo.html#GIPropertyInfo" title="GIPropertyInfo"><span class="type">GIPropertyInfo</span></a> *info</code></em>);</pre>
-<p>Obtain the flags for this property info. See <a href="https://developer.gnome.org/gobject/unstable/gobject-GParamSpec.html#GParamFlags"><span class="type">GParamFlags</span></a> for
+<p>Obtain the flags for this property info. See <span class="type">GParamFlags</span> for
 more information about possible flag values.</p>
 <div class="refsect3">
 <a name="id-1.4.2.20.6.3.5"></a><h4>Parameters</h4>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIRegisteredTypeInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIRegisteredTypeInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIRegisteredTypeInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIRegisteredTypeInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -46,14 +46,14 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIRegisteredTypeInfo.html#g-registered-type-info-get-type-name" title="g_registered_type_info_get_type_name ()">g_registered_type_info_get_type_name</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIRegisteredTypeInfo.html#g-registered-type-info-get-type-init" title="g_registered_type_info_get_type_init ()">g_registered_type_info_get_type_init</a> <span class="c_punctuation">()</span>
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
+<span class="returnvalue">GType</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIRegisteredTypeInfo.html#g-registered-type-info-get-g-type" title="g_registered_type_info_get_g_type ()">g_registered_type_info_get_g_type</a> <span class="c_punctuation">()</span>
@@ -131,10 +131,10 @@
 <hr>
 <div class="refsect2">
 <a name="g-registered-type-info-get-type-name"></a><h3>g_registered_type_info_get_type_name ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_registered_type_info_get_type_name (<em class="parameter"><code><a class="link" href="gi-GIRegisteredTypeInfo.html#GIRegisteredTypeInfo" title="GIRegisteredTypeInfo"><span class="type">GIRegisteredTypeInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the type name of the struct within the GObject type system.
-This type can be passed to <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-name"><code class="function">g_type_name()</code></a> to get a <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.</p>
+This type can be passed to <code class="function">g_type_name()</code> to get a <span class="type">GType</span>.</p>
 <div class="refsect3">
 <a name="id-1.4.2.11.6.3.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -158,7 +158,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-registered-type-info-get-type-init"></a><h3>g_registered_type_info_get_type_init ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_registered_type_info_get_type_init (<em class="parameter"><code><a class="link" href="gi-GIRegisteredTypeInfo.html#GIRegisteredTypeInfo" title="GIRegisteredTypeInfo"><span class="type">GIRegisteredTypeInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the type init function for <em class="parameter"><code>info</code></em>
 . The type init function is the
@@ -183,15 +183,15 @@
 <div class="refsect3">
 <a name="id-1.4.2.11.6.4.6"></a><h4>Returns</h4>
 <p> the symbol name of the type init function, suitable for
-passing into <a href="https://developer.gnome.org/glib/unstable/glib-Dynamic-Loading-of-Modules.html#g-module-symbol"><code class="function">g_module_symbol()</code></a>.</p>
+passing into <code class="function">g_module_symbol()</code>.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-registered-type-info-get-g-type"></a><h3>g_registered_type_info_get_g_type ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="returnvalue">GType</span></a>
+<pre class="programlisting"><span class="returnvalue">GType</span>
 g_registered_type_info_get_g_type (<em class="parameter"><code><a class="link" href="gi-GIRegisteredTypeInfo.html#GIRegisteredTypeInfo" title="GIRegisteredTypeInfo"><span class="type">GIRegisteredTypeInfo</span></a> *info</code></em>);</pre>
-<p>Obtain the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> for this registered type or G_TYPE_NONE which a special meaning.
+<p>Obtain the <span class="type">GType</span> for this registered type or G_TYPE_NONE which a special meaning.
 It means that either there is no type information associated with this <em class="parameter"><code>info</code></em>
  or
 that the shared library which provides the type_init function for this
@@ -214,7 +214,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.11.6.5.6"></a><h4>Returns</h4>
-<p> the <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.</p>
+<p> the <span class="type">GType</span>.</p>
 </div>
 </div>
 </div>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-girffi.html gobject-introspection-1.46.0/docs/reference/html/gi-girffi.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-girffi.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-girffi.html	2015-09-22 11:27:24.000000000 +0000
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-girffi.html#g-function-info-prep-invoker" title="g_function_info_prep_invoker ()">g_function_info_prep_invoker</a> <span class="c_punctuation">()</span>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-girffi.html#g-function-invoker-new-for-address" title="g_function_invoker_new_for_address ()">g_function_invoker_new_for_address</a> <span class="c_punctuation">()</span>
@@ -185,7 +185,7 @@
 <a name="gi-type-tag-get-ffi-type"></a><h3>gi_type_tag_get_ffi_type ()</h3>
 <pre class="programlisting"><span class="returnvalue">ffi_type</span> *
 gi_type_tag_get_ffi_type (<em class="parameter"><code><a class="link" href="gi-common-types.html#GITypeTag" title="enum GITypeTag"><span class="type">GITypeTag</span></a> type_tag</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> is_pointer</code></em>);</pre>
+                          <em class="parameter"><code><span class="type">gboolean</span> is_pointer</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.4.2.6.3.5"></a><h4>Parameters</h4>
@@ -285,10 +285,10 @@
 <hr>
 <div class="refsect2">
 <a name="g-function-info-prep-invoker"></a><h3>g_function_info_prep_invoker ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_function_info_prep_invoker (<em class="parameter"><code><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="type">GIFunctionInfo</span></a> *info</code></em>,
                               <em class="parameter"><code><a class="link" href="gi-girffi.html#GIFunctionInvoker" title="struct GIFunctionInvoker"><span class="type">GIFunctionInvoker</span></a> *invoker</code></em>,
-                              <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                              <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Initialize the caller-allocated <em class="parameter"><code>invoker</code></em>
  structure with a cache
 of information needed to invoke the C function corresponding to
@@ -318,7 +318,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
+<td class="parameter_description"><p>A <span class="type">GError</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -326,18 +326,18 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.4.2.6.6.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise with <em class="parameter"><code>error</code></em>
+<p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise with <em class="parameter"><code>error</code></em>
 set.</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-function-invoker-new-for-address"></a><h3>g_function_invoker_new_for_address ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
-g_function_invoker_new_for_address (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> addr</code></em>,
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
+g_function_invoker_new_for_address (<em class="parameter"><code><span class="type">gpointer</span> addr</code></em>,
                                     <em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *info</code></em>,
                                     <em class="parameter"><code><a class="link" href="gi-girffi.html#GIFunctionInvoker" title="struct GIFunctionInvoker"><span class="type">GIFunctionInvoker</span></a> *invoker</code></em>,
-                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Initialize the caller-allocated <em class="parameter"><code>invoker</code></em>
  structure with a cache
 of information needed to invoke the C function corresponding to
@@ -372,7 +372,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
+<td class="parameter_description"><p>A <span class="type">GError</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -380,7 +380,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.4.2.6.7.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise with <em class="parameter"><code>error</code></em>
+<p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> otherwise with <em class="parameter"><code>error</code></em>
 set.</p>
 </div>
 </div>
@@ -416,7 +416,7 @@
 g_callable_info_prepare_closure (<em class="parameter"><code><a class="link" href="gi-GICallableInfo.html#GICallableInfo" title="GICallableInfo"><span class="type">GICallableInfo</span></a> *callable_info</code></em>,
                                  <em class="parameter"><code><span class="type">ffi_cif</span> *cif</code></em>,
                                  <em class="parameter"><code><a class="link" href="gi-girffi.html#GIFFIClosureCallback" title="GIFFIClosureCallback ()"><span class="type">GIFFIClosureCallback</span></a> callback</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre>
+                                 <em class="parameter"><code><span class="type">gpointer</span> user_data</code></em>);</pre>
 <p>Prepares a callback for ffi invocation.</p>
 <div class="refsect3">
 <a name="id-1.4.4.2.6.9.5"></a><h4>Parameters</h4>
@@ -512,7 +512,7 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> <em class="structfield"><code><a name="GIFunctionInvoker.native-address"></a>native_address</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">gpointer</span> <em class="structfield"><code><a name="GIFunctionInvoker.native-address"></a>native_address</code></em>;</p></td>
 <td class="struct_member_description"><p>the native address</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GISignalInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GISignalInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GISignalInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GISignalInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#GSignalFlags"><span class="returnvalue">GSignalFlags</span></a>
+<span class="returnvalue">GSignalFlags</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GISignalInfo.html#g-signal-info-get-flags" title="g_signal_info_get_flags ()">g_signal_info_get_flags</a> <span class="c_punctuation">()</span>
@@ -63,7 +63,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GISignalInfo.html#g-signal-info-true-stops-emit" title="g_signal_info_true_stops_emit ()">g_signal_info_true_stops_emit</a> <span class="c_punctuation">()</span>
@@ -128,9 +128,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-signal-info-get-flags"></a><h3>g_signal_info_get_flags ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#GSignalFlags"><span class="returnvalue">GSignalFlags</span></a>
+<pre class="programlisting"><span class="returnvalue">GSignalFlags</span>
 g_signal_info_get_flags (<em class="parameter"><code><a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="type">GISignalInfo</span></a> *info</code></em>);</pre>
-<p>Obtain the flags for this signal info. See <a href="https://developer.gnome.org/gobject/unstable/gobject-Signals.html#GSignalFlags"><span class="type">GSignalFlags</span></a> for
+<p>Obtain the flags for this signal info. See <span class="type">GSignalFlags</span> for
 more information about possible flag values.</p>
 <div class="refsect3">
 <a name="id-1.4.2.9.6.3.5"></a><h4>Parameters</h4>
@@ -159,7 +159,7 @@
 g_signal_info_get_class_closure (<em class="parameter"><code><a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="type">GISignalInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the class closure for this signal if one is set. The class
 closure is a virtual function on the type that the signal belongs to.
-If the signal lacks a closure <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> will be returned.</p>
+If the signal lacks a closure <code class="literal">NULL</code> will be returned.</p>
 <div class="refsect3">
 <a name="id-1.4.2.9.6.4.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -177,14 +177,14 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.9.6.4.6"></a><h4>Returns</h4>
-<p> the class closure or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
+<p> the class closure or <code class="literal">NULL</code>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-signal-info-true-stops-emit"></a><h3>g_signal_info_true_stops_emit ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_signal_info_true_stops_emit (<em class="parameter"><code><a class="link" href="gi-GISignalInfo.html#GISignalInfo" title="GISignalInfo"><span class="type">GISignalInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if the returning true in the signal handler will
 stop the emission of the signal.</p>
@@ -205,7 +205,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.9.6.5.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if returning true stops the signal emission</p>
+<p> <code class="literal">TRUE</code> if returning true stops the signal emission</p>
 </div>
 </div>
 </div>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIStructInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIStructInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIStructInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIStructInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -47,7 +47,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<span class="returnvalue">gsize</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIStructInfo.html#g-struct-info-get-alignment" title="g_struct_info_get_alignment ()">g_struct_info_get_alignment</a> <span class="c_punctuation">()</span>
@@ -55,7 +55,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<span class="returnvalue">gsize</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIStructInfo.html#g-struct-info-get-size" title="g_struct_info_get_size ()">g_struct_info_get_size</a> <span class="c_punctuation">()</span>
@@ -63,7 +63,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIStructInfo.html#g-struct-info-is-gtype-struct" title="g_struct_info_is_gtype_struct ()">g_struct_info_is_gtype_struct</a> <span class="c_punctuation">()</span>
@@ -71,7 +71,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIStructInfo.html#g-struct-info-is-foreign" title="g_struct_info_is_foreign ()">g_struct_info_is_foreign</a> <span class="c_punctuation">()</span>
@@ -79,7 +79,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIStructInfo.html#g-struct-info-get-n-fields" title="g_struct_info_get_n_fields ()">g_struct_info_get_n_fields</a> <span class="c_punctuation">()</span>
@@ -95,7 +95,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIStructInfo.html#g-struct-info-get-n-methods" title="g_struct_info_get_n_methods ()">g_struct_info_get_n_methods</a> <span class="c_punctuation">()</span>
@@ -172,7 +172,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-struct-info-get-alignment"></a><h3>g_struct_info_get_alignment ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<pre class="programlisting"><span class="returnvalue">gsize</span>
 g_struct_info_get_alignment (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the required alignment of the structure.</p>
 <div class="refsect3">
@@ -198,7 +198,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-struct-info-get-size"></a><h3>g_struct_info_get_size ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<pre class="programlisting"><span class="returnvalue">gsize</span>
 g_struct_info_get_size (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the total size of the structure.</p>
 <div class="refsect3">
@@ -224,10 +224,10 @@
 <hr>
 <div class="refsect2">
 <a name="g-struct-info-is-gtype-struct"></a><h3>g_struct_info_is_gtype_struct ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_struct_info_is_gtype_struct (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>);</pre>
 <p>Return true if this structure represents the "class structure" for some
-<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct"><span class="type">GObject</span></a> or <a href="https://developer.gnome.org/gobject/unstable/GTypeModule.html"><span class="type">GInterface</span></a>.  This function is mainly useful to hide this kind of structure
+<span class="type">GObject</span> or <a href="/home/ebassi/gnome/install/share/gtk-doc/html/gobject/GTypeModule.html"><span class="type">GInterface</span></a>.  This function is mainly useful to hide this kind of structure
 from generated public APIs.</p>
 <div class="refsect3">
 <a name="id-1.4.2.13.6.5.5"></a><h4>Parameters</h4>
@@ -246,13 +246,13 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.13.6.5.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if this is a class struct, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+<p> <code class="literal">TRUE</code> if this is a class struct, <code class="literal">FALSE</code> otherwise</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-struct-info-is-foreign"></a><h3>g_struct_info_is_foreign ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_struct_info_is_foreign (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
@@ -278,7 +278,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-struct-info-get-n-fields"></a><h3>g_struct_info_get_n_fields ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_struct_info_get_n_fields (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of fields this structure has.</p>
 <div class="refsect3">
@@ -306,7 +306,7 @@
 <a name="g-struct-info-get-field"></a><h3>g_struct_info_get_field ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="returnvalue">GIFieldInfo</span></a> *
 g_struct_info_get_field (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain the type information for field with specified index.</p>
 <div class="refsect3">
 <a name="id-1.4.2.13.6.8.5"></a><h4>Parameters</h4>
@@ -340,7 +340,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-struct-info-get-n-methods"></a><h3>g_struct_info_get_n_methods ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_struct_info_get_n_methods (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of methods this structure has.</p>
 <div class="refsect3">
@@ -368,7 +368,7 @@
 <a name="g-struct-info-get-method"></a><h3>g_struct_info_get_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_struct_info_get_method (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                          <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain the type information for method with specified index.</p>
 <div class="refsect3">
 <a name="id-1.4.2.13.6.10.5"></a><h4>Parameters</h4>
@@ -404,7 +404,7 @@
 <a name="g-struct-info-find-method"></a><h3>g_struct_info_find_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_struct_info_find_method (<em class="parameter"><code><a class="link" href="gi-GIStructInfo.html#GIStructInfo" title="GIStructInfo"><span class="type">GIStructInfo</span></a> *info</code></em>,
-                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                           <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Obtain the type information for method named <em class="parameter"><code>name</code></em>
 .</p>
 <div class="refsect3">
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GITypeInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GITypeInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GITypeInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GITypeInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -46,14 +46,14 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypeInfo.html#g-type-tag-to-string" title="g_type_tag_to_string ()">g_type_tag_to_string</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypeInfo.html#g-info-type-to-string" title="g_info_type_to_string ()">g_info_type_to_string</a> <span class="c_punctuation">()</span>
@@ -61,7 +61,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypeInfo.html#g-type-info-is-pointer" title="g_type_info_is_pointer ()">g_type_info_is_pointer</a> <span class="c_punctuation">()</span>
@@ -93,7 +93,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypeInfo.html#g-type-info-get-array-length" title="g_type_info_get_array_length ()">g_type_info_get_array_length</a> <span class="c_punctuation">()</span>
@@ -101,7 +101,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypeInfo.html#g-type-info-get-array-fixed-size" title="g_type_info_get_array_fixed_size ()">g_type_info_get_array_fixed_size</a> <span class="c_punctuation">()</span>
@@ -109,7 +109,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypeInfo.html#g-type-info-is-zero-terminated" title="g_type_info_is_zero_terminated ()">g_type_info_is_zero_terminated</a> <span class="c_punctuation">()</span>
@@ -183,7 +183,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-type-tag-to-string"></a><h3>g_type_tag_to_string ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_type_tag_to_string (<em class="parameter"><code><a class="link" href="gi-common-types.html#GITypeTag" title="enum GITypeTag"><span class="type">GITypeTag</span></a> type</code></em>);</pre>
 <p>Obtain a string representation of <em class="parameter"><code>type</code></em>
 </p>
@@ -210,7 +210,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-info-type-to-string"></a><h3>g_info_type_to_string ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_info_type_to_string (<em class="parameter"><code><a class="link" href="gi-GIBaseInfo.html#GIInfoType" title="enum GIInfoType"><span class="type">GIInfoType</span></a> type</code></em>);</pre>
 <p>Obtain a string representation of <em class="parameter"><code>type</code></em>
 </p>
@@ -237,7 +237,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-type-info-is-pointer"></a><h3>g_type_info_is_pointer ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_type_info_is_pointer (<em class="parameter"><code><a class="link" href="gi-GITypeInfo.html#GITypeInfo" title="GITypeInfo"><span class="type">GITypeInfo</span></a> *info</code></em>);</pre>
 <p>Obtain if the type is passed as a reference.</p>
 <div class="refsect3">
@@ -257,7 +257,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.21.6.5.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if it is a pointer</p>
+<p> <code class="literal">TRUE</code> if it is a pointer</p>
 </div>
 </div>
 <hr>
@@ -292,7 +292,7 @@
 <a name="g-type-info-get-param-type"></a><h3>g_type_info_get_param_type ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GITypeInfo.html#GITypeInfo" title="GITypeInfo"><span class="returnvalue">GITypeInfo</span></a> *
 g_type_info_get_param_type (<em class="parameter"><code><a class="link" href="gi-GITypeInfo.html#GITypeInfo" title="GITypeInfo"><span class="type">GITypeInfo</span></a> *info</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                            <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain the parameter type <em class="parameter"><code>n</code></em>
 .</p>
 <div class="refsect3">
@@ -349,7 +349,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.21.6.8.6"></a><h4>Returns</h4>
-<p> the <span class="type">GIBaseInfo</span>, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Free it with
+<p> the <span class="type">GIBaseInfo</span>, or <code class="literal">NULL</code>. Free it with
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -357,7 +357,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-type-info-get-array-length"></a><h3>g_type_info_get_array_length ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_type_info_get_array_length (<em class="parameter"><code><a class="link" href="gi-GITypeInfo.html#GITypeInfo" title="GITypeInfo"><span class="type">GITypeInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the array length of the type. The type tag must be a
 <a class="link" href="gi-common-types.html#GI-TYPE-TAG-ARRAY:CAPS"><span class="type">GI_TYPE_TAG_ARRAY</span></a> or -1 will returned.</p>
@@ -384,7 +384,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-type-info-get-array-fixed-size"></a><h3>g_type_info_get_array_fixed_size ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_type_info_get_array_fixed_size (<em class="parameter"><code><a class="link" href="gi-GITypeInfo.html#GITypeInfo" title="GITypeInfo"><span class="type">GITypeInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the fixed array size of the type. The type tag must be a
 <a class="link" href="gi-common-types.html#GI-TYPE-TAG-ARRAY:CAPS"><span class="type">GI_TYPE_TAG_ARRAY</span></a> or -1 will returned.</p>
@@ -411,10 +411,10 @@
 <hr>
 <div class="refsect2">
 <a name="g-type-info-is-zero-terminated"></a><h3>g_type_info_is_zero_terminated ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_type_info_is_zero_terminated (<em class="parameter"><code><a class="link" href="gi-GITypeInfo.html#GITypeInfo" title="GITypeInfo"><span class="type">GITypeInfo</span></a> *info</code></em>);</pre>
-<p>Obtain if the last element of the array is <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. The type tag must be a
-<a class="link" href="gi-common-types.html#GI-TYPE-TAG-ARRAY:CAPS"><span class="type">GI_TYPE_TAG_ARRAY</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> will returned.</p>
+<p>Obtain if the last element of the array is <code class="literal">NULL</code>. The type tag must be a
+<a class="link" href="gi-common-types.html#GI-TYPE-TAG-ARRAY:CAPS"><span class="type">GI_TYPE_TAG_ARRAY</span></a> or <code class="literal">FALSE</code> will returned.</p>
 <div class="refsect3">
 <a name="id-1.4.2.21.6.11.5"></a><h4>Parameters</h4>
 <div class="informaltable"><table width="100%" border="0">
@@ -432,7 +432,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.21.6.11.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if zero terminated</p>
+<p> <code class="literal">TRUE</code> if zero terminated</p>
 </div>
 </div>
 <hr>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-gitypelib.html gobject-introspection-1.46.0/docs/reference/html/gi-gitypelib.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-gitypelib.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-gitypelib.html	2015-09-22 11:27:24.000000000 +0000
@@ -73,14 +73,14 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-gitypelib.html#g-typelib-symbol" title="g_typelib_symbol ()">g_typelib_symbol</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="gi-gitypelib.html#g-typelib-get-namespace" title="g_typelib_get_namespace ()">g_typelib_get_namespace</a> <span class="c_punctuation">()</span>
@@ -111,12 +111,12 @@
 <div class="refsect2">
 <a name="g-typelib-new-from-memory"></a><h3>g_typelib_new_from_memory ()</h3>
 <pre class="programlisting"><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="returnvalue">GITypelib</span></a> *
-g_typelib_new_from_memory (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *memory</code></em>,
-                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> len</code></em>,
-                           <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+g_typelib_new_from_memory (<em class="parameter"><code><span class="type">guint8</span> *memory</code></em>,
+                           <em class="parameter"><code><span class="type">gsize</span> len</code></em>,
+                           <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Creates a new <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> from a memory location.  The memory block
 pointed to by <em class="parameter"><code>typelib</code></em>
- will be automatically <a href="https://developer.gnome.org/glib/unstable/glib-Memory-Allocation.html#g-free"><code class="function">g_free()</code></a>d when the
+ will be automatically <code class="function">g_free()</code>d when the
 repository is destroyed.</p>
 <p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
@@ -140,7 +140,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
+<td class="parameter_description"><p>a <span class="type">GError</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -155,9 +155,9 @@
 <div class="refsect2">
 <a name="g-typelib-new-from-const-memory"></a><h3>g_typelib_new_from_const_memory ()</h3>
 <pre class="programlisting"><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="returnvalue">GITypelib</span></a> *
-g_typelib_new_from_const_memory (<em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> *memory</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="type">gsize</span></a> len</code></em>,
-                                 <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+g_typelib_new_from_const_memory (<em class="parameter"><code>const <span class="type">guint8</span> *memory</code></em>,
+                                 <em class="parameter"><code><span class="type">gsize</span> len</code></em>,
+                                 <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Creates a new <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> from a memory location.</p>
 <p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
@@ -181,7 +181,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>A <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
+<td class="parameter_description"><p>A <span class="type">GError</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -196,9 +196,9 @@
 <div class="refsect2">
 <a name="g-typelib-new-from-mapped-file"></a><h3>g_typelib_new_from_mapped_file ()</h3>
 <pre class="programlisting"><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="returnvalue">GITypelib</span></a> *
-g_typelib_new_from_mapped_file (<em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-File-Utilities.html#GMappedFile"><span class="type">GMappedFile</span></a> *mfile</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
-<p>Creates a new <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> from a <a href="https://developer.gnome.org/glib/unstable/glib-File-Utilities.html#GMappedFile"><span class="type">GMappedFile</span></a>.</p>
+g_typelib_new_from_mapped_file (<em class="parameter"><code><span class="type">GMappedFile</span> *mfile</code></em>,
+                                <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
+<p>Creates a new <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> from a <span class="type">GMappedFile</span>.</p>
 <p><span class="annotation">[<acronym title="Exposed in C code, not necessarily available in other languages."><span class="acronym">skip</span></acronym>]</span></p>
 <div class="refsect3">
 <a name="id-1.4.3.2.6.4.6"></a><h4>Parameters</h4>
@@ -211,12 +211,12 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>mfile</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-File-Utilities.html#GMappedFile"><span class="type">GMappedFile</span></a>, that will be free'd when the repository is destroyed</p></td>
+<td class="parameter_description"><p>a <span class="type">GMappedFile</span>, that will be free'd when the repository is destroyed</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
+<td class="parameter_description"><p>a <span class="type">GError</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -252,10 +252,10 @@
 <hr>
 <div class="refsect2">
 <a name="g-typelib-symbol"></a><h3>g_typelib_symbol ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_typelib_symbol (<em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
-                  <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *symbol_name</code></em>,
-                  <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> *symbol</code></em>);</pre>
+                  <em class="parameter"><code>const <span class="type">gchar</span> *symbol_name</code></em>,
+                  <em class="parameter"><code><span class="type">gpointer</span> *symbol</code></em>);</pre>
 <p>Loads a symbol from <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a>.</p>
 <div class="refsect3">
 <a name="id-1.4.3.2.6.6.5"></a><h4>Parameters</h4>
@@ -286,13 +286,13 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.3.2.6.6.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><span class="type">TRUE</span></a> on success</p>
+<p> <span class="type">TRUE</span> on success</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-typelib-get-namespace"></a><h3>g_typelib_get_namespace ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_typelib_get_namespace (<em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GITypelib.html gobject-introspection-1.46.0/docs/reference/html/gi-GITypelib.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GITypelib.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GITypelib.html	2015-09-22 11:27:24.000000000 +0000
@@ -83,7 +83,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypelib.html#g-typelib-matches-gtype-name-prefix" title="g_typelib_matches_gtype_name_prefix ()">g_typelib_matches_gtype_name_prefix</a> <span class="c_punctuation">()</span>
@@ -109,7 +109,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>
+<span class="returnvalue">GQuark</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypelib.html#g-typelib-error-quark" title="g_typelib_error_quark ()">g_typelib_error_quark</a> <span class="c_punctuation">()</span>
@@ -117,7 +117,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GITypelib.html#g-typelib-validate" title="g_typelib_validate ()">g_typelib_validate</a> <span class="c_punctuation">()</span>
@@ -305,7 +305,7 @@
 <a name="g-typelib-get-dir-entry"></a><h3>g_typelib_get_dir_entry ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GITypelib.html#DirEntry" title="DirEntry"><span class="returnvalue">DirEntry</span></a> *
 g_typelib_get_dir_entry (<em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> index</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">guint16</span> index</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.3.3.7.2.5"></a><h4>Parameters</h4>
@@ -373,7 +373,7 @@
 <a name="g-typelib-get-dir-entry-by-gtype-name"></a><h3>g_typelib_get_dir_entry_by_gtype_name ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GITypelib.html#DirEntry" title="DirEntry"><span class="returnvalue">DirEntry</span></a> *
 g_typelib_get_dir_entry_by_gtype_name (<em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
-                                       <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *gtype_name</code></em>);</pre>
+                                       <em class="parameter"><code>const <span class="type">gchar</span> *gtype_name</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.3.3.7.4.5"></a><h4>Parameters</h4>
@@ -408,7 +408,7 @@
 <pre class="programlisting"><a class="link" href="gi-GITypelib.html#DirEntry" title="DirEntry"><span class="returnvalue">DirEntry</span></a> *
 g_typelib_get_dir_entry_by_error_domain
                                (<em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> error_domain</code></em>);</pre>
+                                <em class="parameter"><code><span class="type">GQuark</span> error_domain</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.3.3.7.5.5"></a><h4>Parameters</h4>
@@ -440,9 +440,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-typelib-matches-gtype-name-prefix"></a><h3>g_typelib_matches_gtype_name_prefix ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_typelib_matches_gtype_name_prefix (<em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
-                                     <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *gtype_name</code></em>);</pre>
+                                     <em class="parameter"><code>const <span class="type">gchar</span> *gtype_name</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.3.3.7.6.5"></a><h4>Parameters</h4>
@@ -520,7 +520,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-typelib-error-quark"></a><h3>g_typelib_error_quark ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a>
+<pre class="programlisting"><span class="returnvalue">GQuark</span>
 g_typelib_error_quark (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
@@ -531,9 +531,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-typelib-validate"></a><h3>g_typelib_validate ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_typelib_validate (<em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
-                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.3.3.7.11.5"></a><h4>Parameters</h4>
@@ -733,18 +733,18 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> <em class="structfield"><code><a name="Header.magic"></a>magic</code></em>[16];</p></td>
+<td class="struct_member_name"><p><span class="type">gchar</span> <em class="structfield"><code><a name="Header.magic"></a>magic</code></em>[16];</p></td>
 <td class="struct_member_description"><p>See <a class="link" href="gi-GITypelib.html#G-IR-MAGIC:CAPS" title="G_IR_MAGIC"><span class="type">G_IR_MAGIC</span></a>.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="Header.major-version"></a>major_version</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="Header.major-version"></a>major_version</code></em>;</p></td>
 <td class="struct_member_description"><p>The major version number of the typelib format. Major version
 number changes indicate incompatible changes to the tyeplib format.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="Header.minor-version"></a>minor_version</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="Header.minor-version"></a>minor_version</code></em>;</p></td>
 <td class="struct_member_description"><p>The minor version number of the typelib format. Minor version
 number changes indicate compatible changes and should still allow the
 typelib to be parsed by a parser designed for the same <em class="parameter"><code>major_version</code></em>
@@ -752,38 +752,38 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.reserved"></a>reserved</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.reserved"></a>reserved</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.n-entries"></a>n_entries</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.n-entries"></a>n_entries</code></em>;</p></td>
 <td class="struct_member_description"><p>The number of entries in the directory.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.n-local-entries"></a>n_local_entries</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.n-local-entries"></a>n_local_entries</code></em>;</p></td>
 <td class="struct_member_description"><p>The number of entries referring to blobs in this typelib.
 The local entries must occur before the unresolved entries.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.directory"></a>directory</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.directory"></a>directory</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the directory in the typelib.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.n-attributes"></a>n_attributes</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.n-attributes"></a>n_attributes</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of attribute blocks</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.attributes"></a>attributes</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.attributes"></a>attributes</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the list of attributes in the typelib.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.dependencies"></a>dependencies</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.dependencies"></a>dependencies</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of a single string, which is the list of immediate
 dependencies, separated by the '|' character.  The dependencies are
 required in order to avoid having programs consuming a typelib check for
@@ -791,130 +791,130 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.size"></a>size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.size"></a>size</code></em>;</p></td>
 <td class="struct_member_description"><p>The size in bytes of the typelib.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.namespace"></a>namespace</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.namespace"></a>namespace</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the namespace string in the typelib.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.nsversion"></a>nsversion</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.nsversion"></a>nsversion</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the namespace version string in the typelib.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.shared-library"></a>shared_library</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.shared-library"></a>shared_library</code></em>;</p></td>
 <td class="struct_member_description"><p>This field is the set of shared libraries associated with
 the typelib.  The entries are separated by the '|' (pipe) character.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.c-prefix"></a>c_prefix</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.c-prefix"></a>c_prefix</code></em>;</p></td>
 <td class="struct_member_description"><p>The prefix for the function names of the library</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.entry-blob-size"></a>entry_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.entry-blob-size"></a>entry_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>The sizes of fixed-size blobs. Recording this information
 here allows to write parser which continue to work if the format is
 extended by adding new fields to the end of the fixed-size blobs.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.function-blob-size"></a>function_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.function-blob-size"></a>function_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.callback-blob-size"></a>callback_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.callback-blob-size"></a>callback_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.signal-blob-size"></a>signal_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.signal-blob-size"></a>signal_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.vfunc-blob-size"></a>vfunc_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.vfunc-blob-size"></a>vfunc_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.arg-blob-size"></a>arg_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.arg-blob-size"></a>arg_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.property-blob-size"></a>property_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.property-blob-size"></a>property_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.field-blob-size"></a>field_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.field-blob-size"></a>field_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.value-blob-size"></a>value_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.value-blob-size"></a>value_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.attribute-blob-size"></a>attribute_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.attribute-blob-size"></a>attribute_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.constant-blob-size"></a>constant_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.constant-blob-size"></a>constant_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.error-domain-blob-size"></a>error_domain_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.error-domain-blob-size"></a>error_domain_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.signature-blob-size"></a>signature_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.signature-blob-size"></a>signature_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.enum-blob-size"></a>enum_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.enum-blob-size"></a>enum_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.struct-blob-size"></a>struct_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.struct-blob-size"></a>struct_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.object-blob-size"></a>object_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.object-blob-size"></a>object_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.interface-blob-size"></a>interface_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.interface-blob-size"></a>interface_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>For variable-size blobs, the size of the struct up to
 the first flexible array member. Recording this information here allows
 to write parser which continue to work if the format is extended by
@@ -923,18 +923,18 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.union-blob-size"></a>union_blob_size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.union-blob-size"></a>union_blob_size</code></em>;</p></td>
 <td class="struct_member_description"><p>See <em class="parameter"><code>entry_blob_size</code></em>
 .</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Header.sections"></a>sections</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Header.sections"></a>sections</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of section blob array</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="Header.padding"></a>padding</code></em>[6];</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="Header.padding"></a>padding</code></em>[6];</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -995,12 +995,12 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Section.id"></a>id</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Section.id"></a>id</code></em>;</p></td>
 <td class="struct_member_description"><p>A <a class="link" href="gi-GITypelib.html#SectionType" title="enum SectionType"><span class="type">SectionType</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="Section.offset"></a>offset</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="Section.offset"></a>offset</code></em>;</p></td>
 <td class="struct_member_description"><p>Integer offset for this section</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1033,27 +1033,27 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="DirEntry.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="DirEntry.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>A <a class="link" href="gi-GITypelib.html#GTypelibBlobType" title="enum GTypelibBlobType"><span class="type">GTypelibBlobType</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="DirEntry.local"></a>local</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="DirEntry.local"></a>local</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Whether this entry refers to a blob in this typelib.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="DirEntry.reserved"></a>reserved</code></em> :15;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="DirEntry.reserved"></a>reserved</code></em> :15;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="DirEntry.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="DirEntry.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name of the entry.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="DirEntry.offset"></a>offset</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="DirEntry.offset"></a>offset</code></em>;</p></td>
 <td class="struct_member_description"><p>If is_local is set, this is the offset of the blob in the typelib.
 Otherwise, it is the offset of the namespace in which the blob has to be
 looked up by name.</p></td>
@@ -1085,27 +1085,27 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="SimpleTypeBlobFlags.reserved"></a>reserved</code></em> : 8;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="SimpleTypeBlobFlags.reserved"></a>reserved</code></em> : 8;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="SimpleTypeBlobFlags.reserved2"></a>reserved2</code></em> :16;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="SimpleTypeBlobFlags.reserved2"></a>reserved2</code></em> :16;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="SimpleTypeBlobFlags.pointer"></a>pointer</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="SimpleTypeBlobFlags.pointer"></a>pointer</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="SimpleTypeBlobFlags.reserved3"></a>reserved3</code></em> : 2;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="SimpleTypeBlobFlags.reserved3"></a>reserved3</code></em> : 2;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="SimpleTypeBlobFlags.tag"></a>tag</code></em> : 5;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="SimpleTypeBlobFlags.tag"></a>tag</code></em> : 5;</p></td>
 <td class="struct_member_description"><p>A <a class="link" href="gi-common-types.html#GITypeTag" title="enum GITypeTag"><span class="type">GITypeTag</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1144,7 +1144,7 @@
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="SimpleTypeBlob.offset"></a>offset</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="SimpleTypeBlob.offset"></a>offset</code></em>;</p></td>
 <td class="union_member_description"><p>Offset relative to header-&gt;types that points to a TypeBlob.
 Unlike other offsets, this is in words (ie 32bit units) rather
 than bytes.</p></td>
@@ -1192,17 +1192,17 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ArgBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ArgBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>A suggested name for the parameter.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.in"></a>in</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.in"></a>in</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The parameter is an input to the function</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.out"></a>out</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.out"></a>out</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The parameter is used to return an output of the function. Parameters
 can be both in and out. Out parameters implicitly add another level of
 indirection to the parameter type. Ie if the type is uint32 in an out
@@ -1210,13 +1210,13 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.caller-allocates"></a>caller_allocates</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.caller-allocates"></a>caller_allocates</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The parameter is a pointer to a struct or object that
 will receive an output of the function.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.nullable"></a>nullable</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.nullable"></a>nullable</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Only meaningful for types which are passed as pointers. For an
 in parameter, indicates if it is ok to pass NULL in. Gor an out
 parameter, indicates whether it may return NULL. Note that NULL is a
@@ -1225,20 +1225,20 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.optional"></a>optional</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.optional"></a>optional</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>For an out parameter, indicates that NULL may be passed in
 if the value is not needed.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.transfer-ownership"></a>transfer_ownership</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.transfer-ownership"></a>transfer_ownership</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>For an in parameter, indicates that the function takes
 over ownership of the parameter value. For an out parameter, it indicates
 that the caller is responsible for freeing the return value.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.transfer-container-ownership"></a>transfer_container_ownership</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.transfer-container-ownership"></a>transfer_container_ownership</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>For container types, indicates that the
 ownership of the container, but not of its contents is transferred.
 This is typically the case for out parameters returning lists of
@@ -1246,7 +1246,7 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.return-value"></a>return_value</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.return-value"></a>return_value</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The parameter should be considered the return value of the
 function. Only out parameters can be marked as return value, and there
 can be at most one per function call. If an out parameter is marked as
@@ -1255,36 +1255,36 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.scope"></a>scope</code></em> : 3;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.scope"></a>scope</code></em> : 3;</p></td>
 <td class="struct_member_description"><p>A <a class="link" href="gi-GIArgInfo.html#GIScopeType" title="enum GIScopeType"><span class="type">GIScopeType</span></a>. If the parameter is of a callback type, this denotes
 the scope of the user_data and the callback function pointer itself
 (for languages that emit code at run-time).</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.skip"></a>skip</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.skip"></a>skip</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Indicates that the parameter is only useful in C and should be skipped.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="ArgBlob.reserved"></a>reserved</code></em> :20;</p></td>
+<td class="struct_member_name"><p><span class="type">guint</span> <em class="structfield"><code><a name="ArgBlob.reserved"></a>reserved</code></em> :20;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint8"><span class="type">gint8</span></a> <em class="structfield"><code><a name="ArgBlob.closure"></a>closure</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">gint8</span> <em class="structfield"><code><a name="ArgBlob.closure"></a>closure</code></em>;</p></td>
 <td class="struct_member_description"><p>Index of the closure (user_data) parameter associated with the
 callback, or -1.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint8"><span class="type">gint8</span></a> <em class="structfield"><code><a name="ArgBlob.destroy"></a>destroy</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">gint8</span> <em class="structfield"><code><a name="ArgBlob.destroy"></a>destroy</code></em>;</p></td>
 <td class="struct_member_description"><p>Index of the destroy notfication callback parameter associated
 with the callback, or -1.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArgBlob.padding"></a>padding</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArgBlob.padding"></a>padding</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1332,49 +1332,49 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.may-return-null"></a>may_return_null</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.may-return-null"></a>may_return_null</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Only relevant for pointer types. Indicates whether the
 caller must expect NULL as a return value.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.caller-owns-return-value"></a>caller_owns_return_value</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.caller-owns-return-value"></a>caller_owns_return_value</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If set, the caller is responsible for freeing
 the return value if it is no longer needed.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.caller-owns-return-container"></a>caller_owns_return_container</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.caller-owns-return-container"></a>caller_owns_return_container</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>This flag is only relevant if the return type
 is a container type. If the flag is set, the caller is resonsible for
 freeing the container, but not its contents.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.skip-return"></a>skip_return</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.skip-return"></a>skip_return</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Indicates that the return value is only useful in C and should
 be skipped.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.instance-transfer-ownership"></a>instance_transfer_ownership</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.instance-transfer-ownership"></a>instance_transfer_ownership</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>When calling, the function assumes ownership of
 the instance parameter.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.throws"></a>throws</code></em> : 1;</p></td>
-<td class="struct_member_description"><p>Denotes the signature takes an additional <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> argument beyond
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.throws"></a>throws</code></em> : 1;</p></td>
+<td class="struct_member_description"><p>Denotes the signature takes an additional <span class="type">GError</span> argument beyond
 the annotated arguments.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.reserved"></a>reserved</code></em> :10;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.reserved"></a>reserved</code></em> :10;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignatureBlob.n-arguments"></a>n_arguments</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignatureBlob.n-arguments"></a>n_arguments</code></em>;</p></td>
 <td class="struct_member_description"><p>The number of arguments that this function expects, also the
 length of the array of ArgBlobs.</p></td>
 <td class="struct_member_annotations"> </td>
@@ -1412,22 +1412,22 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="CommonBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="CommonBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>A <a class="link" href="gi-GITypelib.html#GTypelibBlobType" title="enum GTypelibBlobType"><span class="type">GTypelibBlobType</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="CommonBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="CommonBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Whether the blob is deprecated.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="CommonBlob.reserved"></a>reserved</code></em> :15;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="CommonBlob.reserved"></a>reserved</code></em> :15;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="CommonBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="CommonBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name of the blob.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1472,82 +1472,82 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p><a class="link" href="gi-GITypelib.html#BLOB-TYPE-FUNCTION:CAPS"><span class="type">BLOB_TYPE_FUNCTION</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The function is deprecated.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.setter"></a>setter</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.setter"></a>setter</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The function is a setter for a property. Language bindings may
 prefer to not bind individual setters and rely on the generic
-<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-set"><code class="function">g_object_set()</code></a>.</p></td>
+<code class="function">g_object_set()</code>.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.getter"></a>getter</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.getter"></a>getter</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The function is a getter for a property. Language bindings may
 prefer to not bind individual getters and rely on the generic
-<a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-get"><code class="function">g_object_get()</code></a>.</p></td>
+<code class="function">g_object_get()</code>.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.constructor"></a>constructor</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.constructor"></a>constructor</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The function acts as a constructor for the object it is
 contained in.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.wraps-vfunc"></a>wraps_vfunc</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.wraps-vfunc"></a>wraps_vfunc</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The function is a simple wrapper for a virtual function.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.throws"></a>throws</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.throws"></a>throws</code></em> : 1;</p></td>
 <td class="struct_member_description"><p> This is now additionally stored in the <a class="link" href="gi-GITypelib.html#SignatureBlob" title="SignatureBlob"><span class="type">SignatureBlob</span></a>. </p></td>
 <td class="struct_member_annotations"><span class="annotation">[deprecated]</span></td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.index"></a>index</code></em> :10;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.index"></a>index</code></em> :10;</p></td>
 <td class="struct_member_description"><p>Index of the property that this function is a setter or getter of
 in the array of properties of the containing interface, or index
 of the virtual function that this function wraps.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="FunctionBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="FunctionBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="FunctionBlob.symbol"></a>symbol</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="FunctionBlob.symbol"></a>symbol</code></em>;</p></td>
 <td class="struct_member_description"><p>The symbol which can be used to obtain the function pointer with
 <code class="function">dlsym()</code>.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="FunctionBlob.signature"></a>signature</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="FunctionBlob.signature"></a>signature</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the SignatureBlob describing the parameter types and the
 return value type.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.is-static"></a>is_static</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.is-static"></a>is_static</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The function is a "static method"; in other words it's a pure
 function whose name is conceptually scoped to the object.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.reserved"></a>reserved</code></em> : 15;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.reserved"></a>reserved</code></em> : 15;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FunctionBlob.reserved2"></a>reserved2</code></em> : 16;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FunctionBlob.reserved2"></a>reserved2</code></em> : 16;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1578,27 +1578,27 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="CallbackBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="CallbackBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="CallbackBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="CallbackBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="CallbackBlob.reserved"></a>reserved</code></em> :15;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="CallbackBlob.reserved"></a>reserved</code></em> :15;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="CallbackBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="CallbackBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="CallbackBlob.signature"></a>signature</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="CallbackBlob.signature"></a>signature</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the <a class="link" href="gi-GITypelib.html#SignatureBlob" title="SignatureBlob"><span class="type">SignatureBlob</span></a> describing the parameter types and
 the return value type.</p></td>
 <td class="struct_member_annotations"> </td>
@@ -1629,27 +1629,27 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="InterfaceTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="InterfaceTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
 <td class="struct_member_description"><p>Whether this type represents an indirection</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="InterfaceTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="InterfaceTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="InterfaceTypeBlob.tag"></a>tag</code></em> :5;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="InterfaceTypeBlob.tag"></a>tag</code></em> :5;</p></td>
 <td class="struct_member_description"><p>A <a class="link" href="gi-common-types.html#GITypeTag" title="enum GITypeTag"><span class="type">GITypeTag</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="InterfaceTypeBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="InterfaceTypeBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceTypeBlob.interface"></a>interface</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceTypeBlob.interface"></a>interface</code></em>;</p></td>
 <td class="struct_member_description"><p>Index of the directory entry for the interface.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1671,12 +1671,12 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeDimension.length"></a>length</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeDimension.length"></a>length</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
 <tr>
-<td class="union_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeDimension.size"></a>size</code></em>;</p></td>
+<td class="union_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeDimension.size"></a>size</code></em>;</p></td>
 <td class="union_member_description"><p>TODO</p></td>
 <td class="union_member_annotations"> </td>
 </tr>
@@ -1714,47 +1714,47 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.tag"></a>tag</code></em> :5;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.tag"></a>tag</code></em> :5;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.zero-terminated"></a>zero_terminated</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.zero-terminated"></a>zero_terminated</code></em> :1;</p></td>
 <td class="struct_member_description"><p>Indicates that the array must be terminated by a suitable
-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> value.</p></td>
+<span class="type">NULL</span> value.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.has-length"></a>has_length</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.has-length"></a>has_length</code></em> :1;</p></td>
 <td class="struct_member_description"><p>Indicates that length points to a parameter specifying the
 length of the array. If both has_length and zero_terminated are set, the
 convention is to pass -1 for the length if the array is zero-terminated.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.has-size"></a>has_size</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.has-size"></a>has_size</code></em> :1;</p></td>
 <td class="struct_member_description"><p>Indicates that size is the fixed size of the array.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.array-type"></a>array_type</code></em> :2;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.array-type"></a>array_type</code></em> :2;</p></td>
 <td class="struct_member_description"><p>Indicates whether this is a C array, GArray, GPtrArray, or
 GByteArray. If something other than a C array, the length and element
 size are implicit in the structure.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ArrayTypeBlob.reserved2"></a>reserved2</code></em> :3;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ArrayTypeBlob.reserved2"></a>reserved2</code></em> :3;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1797,27 +1797,27 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ParamTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ParamTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ParamTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ParamTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ParamTypeBlob.tag"></a>tag</code></em> :5;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ParamTypeBlob.tag"></a>tag</code></em> :5;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ParamTypeBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ParamTypeBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ParamTypeBlob.n-types"></a>n_types</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ParamTypeBlob.n-types"></a>n_types</code></em>;</p></td>
 <td class="struct_member_description"><p>The number of parameter types to follow.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1855,32 +1855,32 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ErrorTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ErrorTypeBlob.pointer"></a>pointer</code></em> :1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ErrorTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ErrorTypeBlob.reserved"></a>reserved</code></em> :2;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ErrorTypeBlob.tag"></a>tag</code></em> :5;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ErrorTypeBlob.tag"></a>tag</code></em> :5;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="ErrorTypeBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="ErrorTypeBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ErrorTypeBlob.n-domains"></a>n_domains</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ErrorTypeBlob.n-domains"></a>n_domains</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO: must be 0</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ErrorTypeBlob.domains"></a>domains</code></em>[];</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ErrorTypeBlob.domains"></a>domains</code></em>[];</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1910,27 +1910,27 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ValueBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ValueBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Whether this value is deprecated</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ValueBlob.unsigned-value"></a>unsigned_value</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ValueBlob.unsigned-value"></a>unsigned_value</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>if set, value is a 32-bit unsigned integer cast to gint32</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ValueBlob.reserved"></a>reserved</code></em> :30;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ValueBlob.reserved"></a>reserved</code></em> :30;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ValueBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ValueBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>Name of blob</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint32"><span class="type">gint32</span></a> <em class="structfield"><code><a name="ValueBlob.value"></a>value</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">gint32</span> <em class="structfield"><code><a name="ValueBlob.value"></a>value</code></em>;</p></td>
 <td class="struct_member_description"><p>The numerical value</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -1968,44 +1968,44 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="FieldBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="FieldBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name of the field.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="FieldBlob.readable"></a>readable</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="FieldBlob.readable"></a>readable</code></em> :1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="FieldBlob.writable"></a>writable</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="FieldBlob.writable"></a>writable</code></em> :1;</p></td>
 <td class="struct_member_description"><p>How the field may be accessed.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="FieldBlob.has-embedded-type"></a>has_embedded_type</code></em> :1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="FieldBlob.has-embedded-type"></a>has_embedded_type</code></em> :1;</p></td>
 <td class="struct_member_description"><p>An anonymous type follows the FieldBlob.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="FieldBlob.reserved"></a>reserved</code></em> :5;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="FieldBlob.reserved"></a>reserved</code></em> :5;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint8"><span class="type">guint8</span></a> <em class="structfield"><code><a name="FieldBlob.bits"></a>bits</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint8</span> <em class="structfield"><code><a name="FieldBlob.bits"></a>bits</code></em>;</p></td>
 <td class="struct_member_description"><p>If this field is part of a bitfield, the number of bits which it
 uses, otherwise 0.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="FieldBlob.struct-offset"></a>struct_offset</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="FieldBlob.struct-offset"></a>struct_offset</code></em>;</p></td>
 <td class="struct_member_description"><p>The offset of the field in the struct. The value 0xFFFF
 indicates that the struct offset is unknown.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="FieldBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="FieldBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -2043,37 +2043,37 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="RegisteredTypeBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="RegisteredTypeBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="RegisteredTypeBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="RegisteredTypeBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="RegisteredTypeBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="RegisteredTypeBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="RegisteredTypeBlob.reserved"></a>reserved</code></em> :14;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="RegisteredTypeBlob.reserved"></a>reserved</code></em> :14;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="RegisteredTypeBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="RegisteredTypeBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="RegisteredTypeBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="RegisteredTypeBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name under which the type is registered with GType.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="RegisteredTypeBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="RegisteredTypeBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
 <td class="struct_member_description"><p>The symbol name of the get_type() function which registers the
 type.</p></td>
 <td class="struct_member_annotations"> </td>
@@ -2120,79 +2120,79 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p><a class="link" href="gi-GITypelib.html#BLOB-TYPE-STRUCT:CAPS"><span class="type">BLOB_TYPE_STRUCT</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Whether this structure is deprecated</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If this is set, the type is not registered with GType.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.is-gtype-struct"></a>is_gtype_struct</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.is-gtype-struct"></a>is_gtype_struct</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Whether this structure is the class or interface layout
 for a GObject</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.alignment"></a>alignment</code></em> : 6;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.alignment"></a>alignment</code></em> : 6;</p></td>
 <td class="struct_member_description"><p>The byte boundary that the struct is aligned to in memory</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.foreign"></a>foreign</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.foreign"></a>foreign</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If the type is foreign, eg if it's expected to be overridden by
 a native language binding instead of relying of introspected bindings.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.reserved"></a>reserved</code></em> : 6;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.reserved"></a>reserved</code></em> : 6;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="StructBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="StructBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="StructBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
-<td class="struct_member_description"><p>String name of the associated <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="StructBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
+<td class="struct_member_description"><p>String name of the associated <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="StructBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
-<td class="struct_member_description"><p>String naming the symbol which gets the runtime <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="StructBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
+<td class="struct_member_description"><p>String naming the symbol which gets the runtime <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="StructBlob.size"></a>size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="StructBlob.size"></a>size</code></em>;</p></td>
 <td class="struct_member_description"><p>The size of the struct in bytes.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.n-fields"></a>n_fields</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.n-fields"></a>n_fields</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="StructBlob.n-methods"></a>n_methods</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="StructBlob.n-methods"></a>n_methods</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="StructBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="StructBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="StructBlob.reserved3"></a>reserved3</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="StructBlob.reserved3"></a>reserved3</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -2238,77 +2238,77 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If this is set, the type is not registered with GType.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.discriminated"></a>discriminated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.discriminated"></a>discriminated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Is set if the union is discriminated</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.alignment"></a>alignment</code></em> : 6;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.alignment"></a>alignment</code></em> : 6;</p></td>
 <td class="struct_member_description"><p>The byte boundary that the union is aligned to in memory</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.reserved"></a>reserved</code></em> : 7;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.reserved"></a>reserved</code></em> : 7;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="UnionBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="UnionBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="UnionBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
-<td class="struct_member_description"><p>String name of the associated <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="UnionBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
+<td class="struct_member_description"><p>String name of the associated <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="UnionBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
-<td class="struct_member_description"><p>String naming the symbol which gets the runtime <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="UnionBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
+<td class="struct_member_description"><p>String naming the symbol which gets the runtime <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="UnionBlob.size"></a>size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="UnionBlob.size"></a>size</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.n-fields"></a>n_fields</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.n-fields"></a>n_fields</code></em>;</p></td>
 <td class="struct_member_description"><p>Length of the arrays</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="UnionBlob.n-functions"></a>n_functions</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="UnionBlob.n-functions"></a>n_functions</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="UnionBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="UnionBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="UnionBlob.reserved3"></a>reserved3</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="UnionBlob.reserved3"></a>reserved3</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint32"><span class="type">gint32</span></a> <em class="structfield"><code><a name="UnionBlob.discriminator-offset"></a>discriminator_offset</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">gint32</span> <em class="structfield"><code><a name="UnionBlob.discriminator-offset"></a>discriminator_offset</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset from the beginning of the union where the
 discriminator of a discriminated union is located. The value 0xFFFF
 indicates that the discriminator offset is unknown.</p></td>
@@ -2358,59 +2358,59 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="EnumBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="EnumBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="EnumBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="EnumBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="EnumBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="EnumBlob.unregistered"></a>unregistered</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If this is set, the type is not registered with GType.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="EnumBlob.storage-type"></a>storage_type</code></em> : 5;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="EnumBlob.storage-type"></a>storage_type</code></em> : 5;</p></td>
 <td class="struct_member_description"><p>The tag of the type used for the enum in the C ABI
 (will be a signed or unsigned integral type)</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="EnumBlob.reserved"></a>reserved</code></em> : 9;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="EnumBlob.reserved"></a>reserved</code></em> : 9;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="EnumBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="EnumBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="EnumBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
-<td class="struct_member_description"><p>String name of the associated <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="EnumBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
+<td class="struct_member_description"><p>String name of the associated <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="EnumBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
-<td class="struct_member_description"><p>String naming the symbol which gets the runtime <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="EnumBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
+<td class="struct_member_description"><p>String naming the symbol which gets the runtime <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="EnumBlob.n-values"></a>n_values</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="EnumBlob.n-values"></a>n_values</code></em>;</p></td>
 <td class="struct_member_description"><p>The length of the values array.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="EnumBlob.n-methods"></a>n_methods</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="EnumBlob.n-methods"></a>n_methods</code></em>;</p></td>
 <td class="struct_member_description"><p>The length of the methods array.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="EnumBlob.error-domain"></a>error_domain</code></em>;</p></td>
-<td class="struct_member_description"><p>String naming the <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> domain this enum is associated with</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="EnumBlob.error-domain"></a>error_domain</code></em>;</p></td>
+<td class="struct_member_description"><p>String naming the <span class="type">GError</span> domain this enum is associated with</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
@@ -2453,44 +2453,44 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name of the property.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.readable"></a>readable</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.readable"></a>readable</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.writable"></a>writable</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.writable"></a>writable</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.construct"></a>construct</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.construct"></a>construct</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.construct-only"></a>construct_only</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.construct-only"></a>construct_only</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The ParamFlags used when registering the property.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.transfer-ownership"></a>transfer_ownership</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.transfer-ownership"></a>transfer_ownership</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>When writing, the type containing the property takes
 ownership of the value. When reading, the returned value needs to be
 released by the caller.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.transfer-container-ownership"></a>transfer_container_ownership</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.transfer-container-ownership"></a>transfer_container_ownership</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>For container types indicates that the
 ownership of the container, but not of its contents, is transferred.
 This is typically the case when reading lists of statically allocated
@@ -2498,12 +2498,12 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.reserved"></a>reserved</code></em> :25;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.reserved"></a>reserved</code></em> :25;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="PropertyBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="PropertyBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -2552,78 +2552,78 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.run-first"></a>run_first</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.run-first"></a>run_first</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.run-last"></a>run_last</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.run-last"></a>run_last</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.run-cleanup"></a>run_cleanup</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.run-cleanup"></a>run_cleanup</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.no-recurse"></a>no_recurse</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.no-recurse"></a>no_recurse</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.detailed"></a>detailed</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.detailed"></a>detailed</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.action"></a>action</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.action"></a>action</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.no-hooks"></a>no_hooks</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.no-hooks"></a>no_hooks</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>The flags used when registering the signal.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.has-class-closure"></a>has_class_closure</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.has-class-closure"></a>has_class_closure</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Set if the signal has a class closure.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.true-stops-emit"></a>true_stops_emit</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.true-stops-emit"></a>true_stops_emit</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Whether the signal has true-stops-emit semantics</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.reserved"></a>reserved</code></em> : 6;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.reserved"></a>reserved</code></em> : 6;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="SignalBlob.class-closure"></a>class_closure</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="SignalBlob.class-closure"></a>class_closure</code></em>;</p></td>
 <td class="struct_member_description"><p>The index of the class closure in the list of virtual
 functions of the object or interface on which the signal is defined.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="SignalBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="SignalBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name of the signal.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="SignalBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="SignalBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="SignalBlob.signature"></a>signature</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="SignalBlob.signature"></a>signature</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the SignatureBlob describing the parameter types
 and the return value type.</p></td>
 <td class="struct_member_annotations"> </td>
@@ -2665,75 +2665,75 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="VFuncBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="VFuncBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name of the virtual function.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.must-chain-up"></a>must_chain_up</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.must-chain-up"></a>must_chain_up</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If set, every implementation of this virtual function must
 chain up to the implementation of the parent class.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.must-be-implemented"></a>must_be_implemented</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.must-be-implemented"></a>must_be_implemented</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If set, every derived class must override this virtual
 function.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.must-not-be-implemented"></a>must_not_be_implemented</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.must-not-be-implemented"></a>must_not_be_implemented</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>If set, derived class must not override this
 virtual function.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.class-closure"></a>class_closure</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.class-closure"></a>class_closure</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>Set if this virtual function is the class closure of a
 signal.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.throws"></a>throws</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.throws"></a>throws</code></em> : 1;</p></td>
 <td class="struct_member_description"><p> This is now additionally stored in the <a class="link" href="gi-GITypelib.html#SignatureBlob" title="SignatureBlob"><span class="type">SignatureBlob</span></a>. </p></td>
 <td class="struct_member_annotations"><span class="annotation">[deprecated]</span></td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.reserved"></a>reserved</code></em> :11;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.reserved"></a>reserved</code></em> :11;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.signal"></a>signal</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.signal"></a>signal</code></em>;</p></td>
 <td class="struct_member_description"><p>The index of the signal in the list of signals of the object or
 interface to which this virtual function belongs.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.struct-offset"></a>struct_offset</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.struct-offset"></a>struct_offset</code></em>;</p></td>
 <td class="struct_member_description"><p>The offset of the function pointer in the class struct.
 The value 0xFFFF indicates that the struct offset is unknown.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.invoker"></a>invoker</code></em> : 10;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.invoker"></a>invoker</code></em> : 10;</p></td>
 <td class="struct_member_description"><p>If a method invoker for this virtual exists, this is the offset
 in the class structure of the method. If no method is known, this value
 will be 0x3ff.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="VFuncBlob.reserved2"></a>reserved2</code></em> : 6;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="VFuncBlob.reserved2"></a>reserved2</code></em> : 6;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="VFuncBlob.reserved3"></a>reserved3</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="VFuncBlob.reserved3"></a>reserved3</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="VFuncBlob.signature"></a>signature</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="VFuncBlob.signature"></a>signature</code></em>;</p></td>
 <td class="struct_member_description"><p>Offset of the SignatureBlob describing the parameter types and
 the return value type.</p></td>
 <td class="struct_member_annotations"> </td>
@@ -2790,135 +2790,135 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p><a class="link" href="gi-GITypelib.html#BLOB-TYPE-OBJECT:CAPS"><span class="type">BLOB_TYPE_OBJECT</span></a></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.abstract"></a>abstract</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.abstract"></a>abstract</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.fundamental"></a>fundamental</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.fundamental"></a>fundamental</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>this object is not a GObject derived type, instead it's
 an additional fundamental type.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.reserved"></a>reserved</code></em> :13;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.reserved"></a>reserved</code></em> :13;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
-<td class="struct_member_description"><p>String name of the associated <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
+<td class="struct_member_description"><p>String name of the associated <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
-<td class="struct_member_description"><p>String naming the symbol which gets the runtime <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a></p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
+<td class="struct_member_description"><p>String naming the symbol which gets the runtime <span class="type">GType</span></p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.parent"></a>parent</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.parent"></a>parent</code></em>;</p></td>
 <td class="struct_member_description"><p>The directory index of the parent type. This is only set for
 objects. If an object does not have a parent, it is zero.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.gtype-struct"></a>gtype_struct</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.gtype-struct"></a>gtype_struct</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.n-interfaces"></a>n_interfaces</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.n-interfaces"></a>n_interfaces</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.n-fields"></a>n_fields</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.n-fields"></a>n_fields</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.n-properties"></a>n_properties</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.n-properties"></a>n_properties</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.n-methods"></a>n_methods</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.n-methods"></a>n_methods</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.n-signals"></a>n_signals</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.n-signals"></a>n_signals</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.n-vfuncs"></a>n_vfuncs</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.n-vfuncs"></a>n_vfuncs</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.n-constants"></a>n_constants</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.n-constants"></a>n_constants</code></em>;</p></td>
 <td class="struct_member_description"><p>The lengths of the arrays.Up to 16bits of padding may be
 inserted between the arrays to ensure that they start on a 32bit
 boundary.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.ref-func"></a>ref_func</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.ref-func"></a>ref_func</code></em>;</p></td>
 <td class="struct_member_description"><p>String pointing to a function which can be called to increase
 the reference count for an instance of this object type.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.unref-func"></a>unref_func</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.unref-func"></a>unref_func</code></em>;</p></td>
 <td class="struct_member_description"><p>String pointing to a function which can be called to decrease
 the reference count for an instance of this object type.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.set-value-func"></a>set_value_func</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.set-value-func"></a>set_value_func</code></em>;</p></td>
 <td class="struct_member_description"><p>String pointing to a function which can be called to
 convert a pointer of this object to a GValue</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.get-value-func"></a>get_value_func</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.get-value-func"></a>get_value_func</code></em>;</p></td>
 <td class="struct_member_description"><p>String pointing to a function which can be called to
 convert extract a pointer to this object from a GValue</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.reserved3"></a>reserved3</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.reserved3"></a>reserved3</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ObjectBlob.reserved4"></a>reserved4</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ObjectBlob.reserved4"></a>reserved4</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ObjectBlob.interfaces"></a>interfaces</code></em>[];</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ObjectBlob.interfaces"></a>interfaces</code></em>[];</p></td>
 <td class="struct_member_description"><p>An array of indices of directory entries for the implemented
 interfaces.</p></td>
 <td class="struct_member_annotations"> </td>
@@ -2966,89 +2966,89 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.reserved"></a>reserved</code></em> :15;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.reserved"></a>reserved</code></em> :15;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="InterfaceBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="InterfaceBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="InterfaceBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="InterfaceBlob.gtype-name"></a>gtype_name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="InterfaceBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="InterfaceBlob.gtype-init"></a>gtype_init</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.gtype-struct"></a>gtype_struct</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.gtype-struct"></a>gtype_struct</code></em>;</p></td>
 <td class="struct_member_description"><p>Name of the interface "class" C structure</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.n-prerequisites"></a>n_prerequisites</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.n-prerequisites"></a>n_prerequisites</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of prerequisites</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.n-properties"></a>n_properties</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.n-properties"></a>n_properties</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of properties</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.n-methods"></a>n_methods</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.n-methods"></a>n_methods</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of methods</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.n-signals"></a>n_signals</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.n-signals"></a>n_signals</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of signals</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.n-vfuncs"></a>n_vfuncs</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.n-vfuncs"></a>n_vfuncs</code></em>;</p></td>
 <td class="struct_member_description"><p>Number of virtual functions</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.n-constants"></a>n_constants</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.n-constants"></a>n_constants</code></em>;</p></td>
 <td class="struct_member_description"><p>The lengths of the arrays. Up to 16bits of padding may be
 inserted between the arrays to ensure that they start on a 32bit
 boundary.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.padding"></a>padding</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.padding"></a>padding</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="InterfaceBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="InterfaceBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="InterfaceBlob.reserved3"></a>reserved3</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="InterfaceBlob.reserved3"></a>reserved3</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="InterfaceBlob.prerequisites"></a>prerequisites</code></em>[];</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="InterfaceBlob.prerequisites"></a>prerequisites</code></em>[];</p></td>
 <td class="struct_member_description"><p>An array of indices of directory entries for required
 interfaces.</p></td>
 <td class="struct_member_annotations"> </td>
@@ -3085,22 +3085,22 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ConstantBlob.blob-type"></a>blob_type</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ConstantBlob.blob-type"></a>blob_type</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ConstantBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ConstantBlob.deprecated"></a>deprecated</code></em> : 1;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint16"><span class="type">guint16</span></a> <em class="structfield"><code><a name="ConstantBlob.reserved"></a>reserved</code></em> :15;</p></td>
+<td class="struct_member_name"><p><span class="type">guint16</span> <em class="structfield"><code><a name="ConstantBlob.reserved"></a>reserved</code></em> :15;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ConstantBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ConstantBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>TODO</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -3111,17 +3111,17 @@
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ConstantBlob.size"></a>size</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ConstantBlob.size"></a>size</code></em>;</p></td>
 <td class="struct_member_description"><p>The size of the value in bytes.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ConstantBlob.offset"></a>offset</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ConstantBlob.offset"></a>offset</code></em>;</p></td>
 <td class="struct_member_description"><p>The offset of the value in the typelib.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="ConstantBlob.reserved2"></a>reserved2</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="ConstantBlob.reserved2"></a>reserved2</code></em>;</p></td>
 <td class="struct_member_description"><p>Reserved for future use.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
@@ -3149,19 +3149,19 @@
 </colgroup>
 <tbody>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="AttributeBlob.offset"></a>offset</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="AttributeBlob.offset"></a>offset</code></em>;</p></td>
 <td class="struct_member_description"><p>The offset of the typelib entry to which this attribute refers.
 Attributes are kept sorted by offset, so that the attributes of an
 entry can be found by a binary search.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="AttributeBlob.name"></a>name</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="AttributeBlob.name"></a>name</code></em>;</p></td>
 <td class="struct_member_description"><p>The name of the attribute, a string.</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
 <tr>
-<td class="struct_member_name"><p><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint32"><span class="type">guint32</span></a> <em class="structfield"><code><a name="AttributeBlob.value"></a>value</code></em>;</p></td>
+<td class="struct_member_name"><p><span class="type">guint32</span> <em class="structfield"><code><a name="AttributeBlob.value"></a>value</code></em>;</p></td>
 <td class="struct_member_description"><p>The value of the attribute (also a string)</p></td>
 <td class="struct_member_annotations"> </td>
 </tr>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIUnionInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIUnionInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIUnionInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIUnionInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -41,7 +41,7 @@
 <tbody>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIUnionInfo.html#g-union-info-get-n-fields" title="g_union_info_get_n_fields ()">g_union_info_get_n_fields</a> <span class="c_punctuation">()</span>
@@ -57,7 +57,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIUnionInfo.html#g-union-info-get-n-methods" title="g_union_info_get_n_methods ()">g_union_info_get_n_methods</a> <span class="c_punctuation">()</span>
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIUnionInfo.html#g-union-info-is-discriminated" title="g_union_info_is_discriminated ()">g_union_info_is_discriminated</a> <span class="c_punctuation">()</span>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIUnionInfo.html#g-union-info-get-discriminator-offset" title="g_union_info_get_discriminator_offset ()">g_union_info_get_discriminator_offset</a> <span class="c_punctuation">()</span>
@@ -113,7 +113,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<span class="returnvalue">gsize</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIUnionInfo.html#g-union-info-get-size" title="g_union_info_get_size ()">g_union_info_get_size</a> <span class="c_punctuation">()</span>
@@ -121,7 +121,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<span class="returnvalue">gsize</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIUnionInfo.html#g-union-info-get-alignment" title="g_union_info_get_alignment ()">g_union_info_get_alignment</a> <span class="c_punctuation">()</span>
@@ -162,7 +162,7 @@
 <a name="gi-GIUnionInfo.functions_details"></a><h2>Functions</h2>
 <div class="refsect2">
 <a name="g-union-info-get-n-fields"></a><h3>g_union_info_get_n_fields ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_union_info_get_n_fields (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of fields this union has.</p>
 <div class="refsect3">
@@ -190,7 +190,7 @@
 <a name="g-union-info-get-field"></a><h3>g_union_info_get_field ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFieldInfo.html#GIFieldInfo" title="GIFieldInfo"><span class="returnvalue">GIFieldInfo</span></a> *
 g_union_info_get_field (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                        <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain the type information for field with specified index.</p>
 <div class="refsect3">
 <a name="id-1.4.2.14.6.3.5"></a><h4>Parameters</h4>
@@ -224,7 +224,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-union-info-get-n-methods"></a><h3>g_union_info_get_n_methods ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_union_info_get_n_methods (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the number of methods this union has.</p>
 <div class="refsect3">
@@ -252,7 +252,7 @@
 <a name="g-union-info-get-method"></a><h3>g_union_info_get_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_union_info_get_method (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>,
-                         <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                         <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain the type information for method with specified index.</p>
 <div class="refsect3">
 <a name="id-1.4.2.14.6.5.5"></a><h4>Parameters</h4>
@@ -286,7 +286,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-union-info-is-discriminated"></a><h3>g_union_info_is_discriminated ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_union_info_is_discriminated (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>);</pre>
 <p>Return true if this union contains discriminator field.</p>
 <div class="refsect3">
@@ -306,13 +306,13 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.14.6.6.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if this is a discriminated union, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+<p> <code class="literal">TRUE</code> if this is a discriminated union, <code class="literal">FALSE</code> otherwise</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-union-info-get-discriminator-offset"></a><h3>g_union_info_get_discriminator_offset ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_union_info_get_discriminator_offset (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>);</pre>
 <p>Returns offset of the discriminator field in the structure.</p>
 <div class="refsect3">
@@ -369,7 +369,7 @@
 <a name="g-union-info-get-discriminator"></a><h3>g_union_info_get_discriminator ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIConstantInfo.html#GIConstantInfo" title="GIConstantInfo"><span class="returnvalue">GIConstantInfo</span></a> *
 g_union_info_get_discriminator (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>,
-                                <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> n</code></em>);</pre>
+                                <em class="parameter"><code><span class="type">gint</span> n</code></em>);</pre>
 <p>Obtain discriminator value assigned for n-th union field, i.e. n-th
 union field is the active one if discriminator contains this
 constant.</p>
@@ -407,7 +407,7 @@
 <a name="g-union-info-find-method"></a><h3>g_union_info_find_method ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIFunctionInfo.html#GIFunctionInfo" title="GIFunctionInfo"><span class="returnvalue">GIFunctionInfo</span></a> *
 g_union_info_find_method (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>,
-                          <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                          <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Obtain the type information for method named <em class="parameter"><code>name</code></em>
 .</p>
 <div class="refsect3">
@@ -442,7 +442,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-union-info-get-size"></a><h3>g_union_info_get_size ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<pre class="programlisting"><span class="returnvalue">gsize</span>
 g_union_info_get_size (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the total size of the union.</p>
 <div class="refsect3">
@@ -468,7 +468,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-union-info-get-alignment"></a><h3>g_union_info_get_alignment ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gsize"><span class="returnvalue">gsize</span></a>
+<pre class="programlisting"><span class="returnvalue">gsize</span>
 g_union_info_get_alignment (<em class="parameter"><code><a class="link" href="gi-GIUnionInfo.html#GIUnionInfo" title="GIUnionInfo"><span class="type">GIUnionInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the required alignment of the union.</p>
 <div class="refsect3">
diff -Nru gobject-introspection-1.45.3/docs/reference/html/gi-GIVFuncInfo.html gobject-introspection-1.46.0/docs/reference/html/gi-GIVFuncInfo.html
--- gobject-introspection-1.45.3/docs/reference/html/gi-GIVFuncInfo.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/gi-GIVFuncInfo.html	2015-09-22 11:27:24.000000000 +0000
@@ -49,7 +49,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-get-offset" title="g_vfunc_info_get_offset ()">g_vfunc_info_get_offset</a> <span class="c_punctuation">()</span>
@@ -73,7 +73,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a>
+<span class="returnvalue">gpointer</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-get-address" title="g_vfunc_info_get_address ()">g_vfunc_info_get_address</a> <span class="c_punctuation">()</span>
@@ -81,7 +81,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="gi-GIVFuncInfo.html#g-vfunc-info-invoke" title="g_vfunc_info_invoke ()">g_vfunc_info_invoke</a> <span class="c_punctuation">()</span>
@@ -155,7 +155,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-vfunc-info-get-offset"></a><h3>g_vfunc_info_get_offset ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_vfunc_info_get_offset (<em class="parameter"><code><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a> *info</code></em>);</pre>
 <p>Obtain the offset of the function pointer in the class struct. The value
 0xFFFF indicates that the struct offset is unknown.</p>
@@ -204,7 +204,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.10.6.4.6"></a><h4>Returns</h4>
-<p> the signal or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none set. </p>
+<p> the signal or <code class="literal">NULL</code> if none set. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
@@ -233,7 +233,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.10.6.5.7"></a><h4>Returns</h4>
-<p> the <a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. Free it with
+<p> the <a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a> or <code class="literal">NULL</code>. Free it with
 <a class="link" href="gi-GIBaseInfo.html#g-base-info-unref" title="g_base_info_unref ()"><code class="function">g_base_info_unref()</code></a> when done. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
@@ -241,10 +241,10 @@
 <hr>
 <div class="refsect2">
 <a name="g-vfunc-info-get-address"></a><h3>g_vfunc_info_get_address ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a>
+<pre class="programlisting"><span class="returnvalue">gpointer</span>
 g_vfunc_info_get_address (<em class="parameter"><code><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a> *info</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> implementor_gtype</code></em>,
-                          <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                          <em class="parameter"><code><span class="type">GType</span> implementor_gtype</code></em>,
+                          <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>This method will look up where inside the type struct of <em class="parameter"><code>implementor_gtype</code></em>
 
 is the implementation for <em class="parameter"><code>info</code></em>
@@ -265,12 +265,12 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>implementor_gtype</p></td>
-<td class="parameter_description"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> implementing this virtual function</p></td>
+<td class="parameter_description"><p><span class="type">GType</span> implementing this virtual function</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p></td>
+<td class="parameter_description"><p>return location for a <span class="type">GError</span></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -278,21 +278,21 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.10.6.6.6"></a><h4>Returns</h4>
-<p> address to a function or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if an error happened</p>
+<p> address to a function or <code class="literal">NULL</code> if an error happened</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-vfunc-info-invoke"></a><h3>g_vfunc_info_invoke ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_vfunc_info_invoke (<em class="parameter"><code><a class="link" href="gi-GIVFuncInfo.html#GIVFuncInfo" title="GIVFuncInfo"><span class="type">GIVFuncInfo</span></a> *info</code></em>,
-                     <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> implementor</code></em>,
+                     <em class="parameter"><code><span class="type">GType</span> implementor</code></em>,
                      <em class="parameter"><code>const <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *in_args</code></em>,
                      <em class="parameter"><code><span class="type">int</span> n_in_args</code></em>,
                      <em class="parameter"><code>const <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *out_args</code></em>,
                      <em class="parameter"><code><span class="type">int</span> n_out_args</code></em>,
                      <em class="parameter"><code><a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a> *return_value</code></em>,
-                     <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                     <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Invokes the function described in <em class="parameter"><code>info</code></em>
  with the given
 arguments. Note that inout parameters must appear in both
@@ -314,7 +314,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>implementor</p></td>
-<td class="parameter_description"><p><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> of the type that implements this virtual function</p></td>
+<td class="parameter_description"><p><span class="type">GType</span> of the type that implements this virtual function</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -322,7 +322,7 @@
 <td class="parameter_description"><p>an array of <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a>s, one for each in
 parameter of <em class="parameter"><code>info</code></em>
 . If there are no in parameter, <em class="parameter"><code>in_args</code></em>
-can be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+can be <code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -336,7 +336,7 @@
 <td class="parameter_description"><p>an array of <a class="link" href="gi-common-types.html#GIArgument" title="GIArgument"><span class="type">GIArgument</span></a>s, one for each out
 parameter of <em class="parameter"><code>info</code></em>
 . If there are no out parameters, <em class="parameter"><code>out_args</code></em>
-may be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+may be <code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
@@ -350,12 +350,12 @@
 <td class="parameter_description"><p>return location for the return value of the
 function. If the function returns void, <em class="parameter"><code>return_value</code></em>
 may be
-<a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>return location for detailed error information, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a></p></td>
+<td class="parameter_description"><p>return location for detailed error information, or <code class="literal">NULL</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -363,7 +363,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.10.6.7.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the function has been invoked, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> if an
+<p> <code class="literal">TRUE</code> if the function has been invoked, <code class="literal">FALSE</code> if an
 error occurred.</p>
 </div>
 </div>
@@ -413,7 +413,7 @@
 <tr>
 <td class="enum_member_name"><p><a name="GI-VFUNC-THROWS:CAPS"></a>GI_VFUNC_THROWS</p></td>
 <td class="enum_member_description">
-<p>Includes a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a></p>
+<p>Includes a <span class="type">GError</span></p>
 </td>
 <td class="enum_member_annotations"> </td>
 </tr>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/GIRepository.html gobject-introspection-1.46.0/docs/reference/html/GIRepository.html
--- gobject-introspection-1.45.3/docs/reference/html/GIRepository.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/GIRepository.html	2015-09-22 11:27:24.000000000 +0000
@@ -50,7 +50,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
+<span class="returnvalue">gchar</span> **
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-dependencies" title="g_irepository_get_dependencies ()">g_irepository_get_dependencies</a> <span class="c_punctuation">()</span>
@@ -58,7 +58,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
+<span class="returnvalue">gchar</span> **
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-immediate-dependencies" title="g_irepository_get_immediate_dependencies ()">g_irepository_get_immediate_dependencies</a> <span class="c_punctuation">()</span>
@@ -66,7 +66,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
+<span class="returnvalue">gchar</span> **
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-loaded-namespaces" title="g_irepository_get_loaded_namespaces ()">g_irepository_get_loaded_namespaces</a> <span class="c_punctuation">()</span>
@@ -74,7 +74,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<span class="returnvalue">gint</span>
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-n-infos" title="g_irepository_get_n_infos ()">g_irepository_get_n_infos</a> <span class="c_punctuation">()</span>
@@ -90,7 +90,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Commandline-option-parser.html#GOptionGroup"><span class="returnvalue">GOptionGroup</span></a> *
+<span class="returnvalue">GOptionGroup</span> *
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-option-group" title="g_irepository_get_option_group ()">g_irepository_get_option_group</a> <span class="c_punctuation">()</span>
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+<span class="returnvalue">GList</span> *
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-enumerate-versions" title="g_irepository_enumerate_versions ()">g_irepository_enumerate_versions</a> <span class="c_punctuation">()</span>
@@ -122,7 +122,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *
+<span class="returnvalue">GSList</span> *
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-search-path" title="g_irepository_get_search_path ()">g_irepository_get_search_path</a> <span class="c_punctuation">()</span>
@@ -136,7 +136,7 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-typelib-path" title="g_irepository_get_typelib_path ()">g_irepository_get_typelib_path</a> <span class="c_punctuation">()</span>
@@ -144,7 +144,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-is-registered" title="g_irepository_is_registered ()">g_irepository_is_registered</a> <span class="c_punctuation">()</span>
@@ -167,21 +167,21 @@
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-c-prefix" title="g_irepository_get_c_prefix ()">g_irepository_get_c_prefix</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-shared-library" title="g_irepository_get_shared_library ()">g_irepository_get_shared_library</a> <span class="c_punctuation">()</span>
 </td>
 </tr>
 <tr>
-<td class="function_type">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<td class="function_type">const <span class="returnvalue">gchar</span> *
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-get-version" title="g_irepository_get_version ()">g_irepository_get_version</a> <span class="c_punctuation">()</span>
@@ -213,7 +213,7 @@
 </tr>
 <tr>
 <td class="function_type">
-<a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<span class="returnvalue">gboolean</span>
 </td>
 <td class="function_name">
 <a class="link" href="GIRepository.html#g-irepository-dump" title="g_irepository_dump ()">g_irepository_dump</a> <span class="c_punctuation">()</span>
@@ -259,7 +259,7 @@
 </div>
 <div class="refsect1">
 <a name="GIRepository.object-hierarchy"></a><h2>Object Hierarchy</h2>
-<pre class="screen">    <a href="https://developer.gnome.org/gobject/unstable/gobject-The-Base-Object-Type.html#GObject-struct">GObject</a>
+<pre class="screen">    GObject
     <span class="lineart">╰──</span> GIRepository
 </pre>
 </div>
@@ -285,7 +285,7 @@
 eventuality that it would become possible, and as a convenience for
 higher level language bindings to conform to the GObject method
 call conventions.</p>
-<p>All methods on <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> also accept <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> as an instance
+<p>All methods on <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> also accept <code class="literal">NULL</code> as an instance
 parameter to mean this default repository, which is usually more
 convenient for C.</p>
 <div class="refsect3">
@@ -297,9 +297,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-dependencies"></a><h3>g_irepository_get_dependencies ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
+<pre class="programlisting"><span class="returnvalue">gchar</span> **
 g_irepository_get_dependencies (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                                <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>Return an array of all (transitive) versioned dependencies for
 <em class="parameter"><code>namespace_</code></em>
 . Returned strings are of the form</p>
@@ -321,7 +321,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -343,10 +343,10 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-immediate-dependencies"></a><h3>g_irepository_get_immediate_dependencies ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
+<pre class="programlisting"><span class="returnvalue">gchar</span> **
 g_irepository_get_immediate_dependencies
                                (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                                <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>Return an array of the immediate versioned dependencies for <em class="parameter"><code>namespace_</code></em>
 .
 Returned strings are of the form <code class="code">namespace-version</code>.</p>
@@ -367,7 +367,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL may be passed as the value in, out, in-out; or as a return value."><span class="acronym">nullable</span></acronym>]</span></td>
 </tr>
@@ -390,7 +390,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-loaded-namespaces"></a><h3>g_irepository_get_loaded_namespaces ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> **
+<pre class="programlisting"><span class="returnvalue">gchar</span> **
 g_irepository_get_loaded_namespaces (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>);</pre>
 <p>Return the list of currently loaded namespaces.</p>
 <div class="refsect3">
@@ -403,7 +403,7 @@
 </colgroup>
 <tbody><tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr></tbody>
@@ -418,9 +418,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-n-infos"></a><h3>g_irepository_get_n_infos ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a>
+<pre class="programlisting"><span class="returnvalue">gint</span>
 g_irepository_get_n_infos (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                           <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>This function returns the number of metadata entries in
 given namespace <em class="parameter"><code>namespace_</code></em>
 .  The namespace must have
@@ -436,7 +436,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -458,8 +458,8 @@
 <a name="g-irepository-get-info"></a><h3>g_irepository_get_info ()</h3>
 <pre class="programlisting"><span class="returnvalue">GIBaseInfo</span> *
 g_irepository_get_info (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                        <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>,
-                        <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> index</code></em>);</pre>
+                        <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>,
+                        <em class="parameter"><code><span class="type">gint</span> index</code></em>);</pre>
 <p>This function returns a particular metadata entry in the
 given namespace <em class="parameter"><code>namespace_</code></em>
 .  The namespace must have
@@ -477,7 +477,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -503,7 +503,7 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-option-group"></a><h3>g_irepository_get_option_group ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Commandline-option-parser.html#GOptionGroup"><span class="returnvalue">GOptionGroup</span></a> *
+<pre class="programlisting"><span class="returnvalue">GOptionGroup</span> *
 g_irepository_get_option_group (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Obtain the option group for girepository, it's used
 by the dumper and for programs that wants to provide
@@ -518,9 +518,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-enumerate-versions"></a><h3>g_irepository_enumerate_versions ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> *
+<pre class="programlisting"><span class="returnvalue">GList</span> *
 g_irepository_enumerate_versions (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                                  <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                                  <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>Obtain an unordered list of versions (either currently loaded or
 available) for <em class="parameter"><code>namespace_</code></em>
  in this <em class="parameter"><code>repository</code></em>
@@ -536,7 +536,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -616,14 +616,14 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-search-path"></a><h3>g_irepository_get_search_path ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="returnvalue">GSList</span></a> *
+<pre class="programlisting"><span class="returnvalue">GSList</span> *
 g_irepository_get_search_path (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>Returns the current search path <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> will use when loading
 typelib files. The list is internal to <span class="type">GIRespository</span> and should not
 be freed, nor should its string elements.</p>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.12.5"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> of strings. </p>
+<p> <span class="type">GSList</span> of strings. </p>
 <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> filename][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -634,7 +634,7 @@
 g_irepository_load_typelib (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
                             <em class="parameter"><code><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> *typelib</code></em>,
                             <em class="parameter"><code><a class="link" href="GIRepository.html#GIRepositoryLoadFlags" title="enum GIRepositoryLoadFlags"><span class="type">GIRepositoryLoadFlags</span></a> flags</code></em>,
-                            <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                            <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.13.5"></a><h4>Parameters</h4>
@@ -647,7 +647,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -673,9 +673,9 @@
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-typelib-path"></a><h3>g_irepository_get_typelib_path ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_irepository_get_typelib_path (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                                <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                                <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>If namespace <em class="parameter"><code>namespace_</code></em>
  is loaded, return the full path to the
 .typelib file it was loaded from.  If the typelib for
@@ -693,7 +693,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -707,16 +707,16 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.14.6"></a><h4>Returns</h4>
-<p> Filesystem path (or $lt;builtin$gt;) if successful, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if namespace is not loaded</p>
+<p> Filesystem path (or $lt;builtin$gt;) if successful, <code class="literal">NULL</code> if namespace is not loaded</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-irepository-is-registered"></a><h3>g_irepository_is_registered ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_irepository_is_registered (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                             <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>,
-                             <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *version</code></em>);</pre>
+                             <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>,
+                             <em class="parameter"><code>const <span class="type">gchar</span> *version</code></em>);</pre>
 <p>Check whether a particular namespace (and optionally, a specific
 version thereof) is currently loaded.  This function is likely to
 only be useful in unusual circumstances; in order to act upon
@@ -734,7 +734,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -745,7 +745,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>version</p></td>
-<td class="parameter_description"><p> Required version, may be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for latest. </p></td>
+<td class="parameter_description"><p> Required version, may be <code class="literal">NULL</code> for latest. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 </tbody>
@@ -753,7 +753,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.15.6"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if namespace-version is loaded, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</p>
+<p> <code class="literal">TRUE</code> if namespace-version is loaded, <code class="literal">FALSE</code> otherwise</p>
 </div>
 </div>
 <hr>
@@ -761,10 +761,10 @@
 <a name="g-irepository-require"></a><h3>g_irepository_require ()</h3>
 <pre class="programlisting"><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="returnvalue">GITypelib</span></a> *
 g_irepository_require (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                       <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>,
-                       <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *version</code></em>,
+                       <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>,
+                       <em class="parameter"><code>const <span class="type">gchar</span> *version</code></em>,
                        <em class="parameter"><code><a class="link" href="GIRepository.html#GIRepositoryLoadFlags" title="enum GIRepositoryLoadFlags"><span class="type">GIRepositoryLoadFlags</span></a> flags</code></em>,
-                       <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                       <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Force the namespace <em class="parameter"><code>namespace_</code></em>
  to be loaded if it isn't already.
 If <em class="parameter"><code>namespace_</code></em>
@@ -785,7 +785,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -796,7 +796,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>version</p></td>
-<td class="parameter_description"><p> Version of namespace, may be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for latest. </p></td>
+<td class="parameter_description"><p> Version of namespace, may be <code class="literal">NULL</code> for latest. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@@ -806,7 +806,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>.</p></td>
+<td class="parameter_description"><p>a <span class="type">GError</span>.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -814,7 +814,7 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.16.6"></a><h4>Returns</h4>
-<p> a pointer to the <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> if successful, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> otherwise. </p>
+<p> a pointer to the <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> if successful, <code class="literal">NULL</code> otherwise. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -823,11 +823,11 @@
 <a name="g-irepository-require-private"></a><h3>g_irepository_require_private ()</h3>
 <pre class="programlisting"><a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="returnvalue">GITypelib</span></a> *
 g_irepository_require_private (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *typelib_dir</code></em>,
-                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>,
-                               <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *version</code></em>,
+                               <em class="parameter"><code>const <span class="type">gchar</span> *typelib_dir</code></em>,
+                               <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>,
+                               <em class="parameter"><code>const <span class="type">gchar</span> *version</code></em>,
                                <em class="parameter"><code><a class="link" href="GIRepository.html#GIRepositoryLoadFlags" title="enum GIRepositoryLoadFlags"><span class="type">GIRepositoryLoadFlags</span></a> flags</code></em>,
-                               <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                               <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Force the namespace <em class="parameter"><code>namespace_</code></em>
  to be loaded if it isn't already.
 If <em class="parameter"><code>namespace_</code></em>
@@ -848,7 +848,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -864,7 +864,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>version</p></td>
-<td class="parameter_description"><p> Version of namespace, may be <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for latest. </p></td>
+<td class="parameter_description"><p> Version of namespace, may be <code class="literal">NULL</code> for latest. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
@@ -874,7 +874,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>.</p></td>
+<td class="parameter_description"><p>a <span class="type">GError</span>.</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -882,19 +882,19 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.17.6"></a><h4>Returns</h4>
-<p> a pointer to the <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> if successful, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> otherwise. </p>
+<p> a pointer to the <a class="link" href="gi-gitypelib.html#GITypelib" title="GITypelib"><span class="type">GITypelib</span></a> if successful, <code class="literal">NULL</code> otherwise. </p>
 <p><span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-c-prefix"></a><h3>g_irepository_get_c_prefix ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_irepository_get_c_prefix (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                            <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                            <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>This function returns the "C prefix", or the C level namespace
 associated with the given introspection namespace.  Each C symbol
-starts with this prefix, as well each <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> in the library.</p>
+starts with this prefix, as well each <span class="type">GType</span> in the library.</p>
 <p>Note: The namespace must have already been loaded using a function
 such as <a class="link" href="GIRepository.html#g-irepository-require" title="g_irepository_require ()"><code class="function">g_irepository_require()</code></a> before calling this function.</p>
 <div class="refsect3">
@@ -908,7 +908,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -922,20 +922,20 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.18.7"></a><h4>Returns</h4>
-<p> C namespace prefix, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none associated</p>
+<p> C namespace prefix, or <code class="literal">NULL</code> if none associated</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-shared-library"></a><h3>g_irepository_get_shared_library ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_irepository_get_shared_library (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                                  <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                                  <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>This function returns a comma-separated list of paths to the
 shared C libraries associated with the given namespace <em class="parameter"><code>namespace_</code></em>
 .
 There may be no shared library path associated, in which case this
-function will return <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>.</p>
+function will return <code class="literal">NULL</code>.</p>
 <p>Note: The namespace must have already been loaded using a function
 such as <a class="link" href="GIRepository.html#g-irepository-require" title="g_irepository_require ()"><code class="function">g_irepository_require()</code></a> before calling this function.</p>
 <div class="refsect3">
@@ -949,7 +949,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -964,15 +964,15 @@
 <div class="refsect3">
 <a name="id-1.4.2.2.8.19.7"></a><h4>Returns</h4>
 <p> Comma-separated list of paths to shared libraries,
-or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if none are associated</p>
+or <code class="literal">NULL</code> if none are associated</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-irepository-get-version"></a><h3>g_irepository_get_version ()</h3>
-<pre class="programlisting">const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> *
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *
 g_irepository_get_version (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                           <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>);</pre>
+                           <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>);</pre>
 <p>This function returns the loaded version associated with the given
 namespace <em class="parameter"><code>namespace_</code></em>
 .</p>
@@ -989,7 +989,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -1011,8 +1011,8 @@
 <a name="g-irepository-find-by-gtype"></a><h3>g_irepository_find_by_gtype ()</h3>
 <pre class="programlisting"><span class="returnvalue">GIBaseInfo</span> *
 g_irepository_find_by_gtype (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a> gtype</code></em>);</pre>
-<p>Searches all loaded namespaces for a particular <a href="https://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#GType"><span class="type">GType</span></a>.  Note that
+                             <em class="parameter"><code><span class="type">GType</span> gtype</code></em>);</pre>
+<p>Searches all loaded namespaces for a particular <span class="type">GType</span>.  Note that
 in order to locate the metadata, the namespace corresponding to
 the type must first have been loaded.  There is currently no
 mechanism for determining the namespace which corresponds to an
@@ -1029,7 +1029,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -1044,7 +1044,7 @@
 <div class="refsect3">
 <a name="id-1.4.2.2.8.21.6"></a><h4>Returns</h4>
 <p> <span class="type">GIBaseInfo</span> representing metadata about <em class="parameter"><code>type</code></em>
-, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
+, or <code class="literal">NULL</code>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
@@ -1053,8 +1053,8 @@
 <a name="g-irepository-find-by-error-domain"></a><h3>g_irepository_find_by_error_domain ()</h3>
 <pre class="programlisting"><a class="link" href="gi-GIEnumInfo.html#GIEnumInfo" title="GIEnumInfo"><span class="returnvalue">GIEnumInfo</span></a> *
 g_irepository_find_by_error_domain (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> domain</code></em>);</pre>
-<p>Searches for the enum type corresponding to the given <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a>
+                                    <em class="parameter"><code><span class="type">GQuark</span> domain</code></em>);</pre>
+<p>Searches for the enum type corresponding to the given <span class="type">GError</span>
 domain. Before calling this function for a particular namespace,
 you must call <a class="link" href="GIRepository.html#g-irepository-require" title="g_irepository_require ()"><code class="function">g_irepository_require()</code></a> once to load the namespace, or
 otherwise ensure the namespace has already been loaded.</p>
@@ -1069,13 +1069,13 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
 <tr>
 <td class="parameter_name"><p>domain</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> domain</p></td>
+<td class="parameter_description"><p>a <span class="type">GError</span> domain</p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -1085,7 +1085,7 @@
 <a name="id-1.4.2.2.8.22.6"></a><h4>Returns</h4>
 <p> <a class="link" href="gi-GIEnumInfo.html#GIEnumInfo" title="GIEnumInfo"><span class="type">GIEnumInfo</span></a> representing metadata about <em class="parameter"><code>domain</code></em>
 's
-enum type, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
+enum type, or <code class="literal">NULL</code>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 <p class="since">Since: <a class="link" href="api-index-1-29-17.html#api-index-1.29.17">1.29.17</a></p>
@@ -1095,8 +1095,8 @@
 <a name="g-irepository-find-by-name"></a><h3>g_irepository_find_by_name ()</h3>
 <pre class="programlisting"><span class="returnvalue">GIBaseInfo</span> *
 g_irepository_find_by_name (<em class="parameter"><code><a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> *repository</code></em>,
-                            <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *namespace_</code></em>,
-                            <em class="parameter"><code>const <a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre>
+                            <em class="parameter"><code>const <span class="type">gchar</span> *namespace_</code></em>,
+                            <em class="parameter"><code>const <span class="type">gchar</span> *name</code></em>);</pre>
 <p>Searches for a particular entry in a namespace.  Before calling
 this function for a particular namespace, you must call
 <a class="link" href="GIRepository.html#g-irepository-require" title="g_irepository_require ()"><code class="function">g_irepository_require()</code></a> once to load the namespace, or otherwise
@@ -1112,7 +1112,7 @@
 <tbody>
 <tr>
 <td class="parameter_name"><p>repository</p></td>
-<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> for the singleton
+<td class="parameter_description"><p> A <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> or <code class="literal">NULL</code> for the singleton
 process-global default <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. </p></td>
 <td class="parameter_annotations"><span class="annotation">[<acronym title="NULL is OK, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span></td>
 </tr>
@@ -1132,16 +1132,16 @@
 <div class="refsect3">
 <a name="id-1.4.2.2.8.23.6"></a><h4>Returns</h4>
 <p> <span class="type">GIBaseInfo</span> representing metadata about <em class="parameter"><code>name</code></em>
-, or <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. </p>
+, or <code class="literal">NULL</code>. </p>
 <p><span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span></p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="g-irepository-dump"></a><h3>g_irepository_dump ()</h3>
-<pre class="programlisting"><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>
 g_irepository_dump (<em class="parameter"><code>const <span class="type">char</span> *arg</code></em>,
-                    <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre>
+                    <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>Argument specified is a comma-separated pair of filenames; i.e. of
 the form "input.txt,output.xml".  The input file should be a
 UTF-8 Unix-line-ending text file, with each line containing either
@@ -1166,7 +1166,7 @@
 </tr>
 <tr>
 <td class="parameter_name"><p>error</p></td>
-<td class="parameter_description"><p>a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><code class="literal">GError</code></a></p></td>
+<td class="parameter_description"><p>a <code class="literal">GError</code></p></td>
 <td class="parameter_annotations"> </td>
 </tr>
 </tbody>
@@ -1174,19 +1174,19 @@
 </div>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.24.7"></a><h4>Returns</h4>
-<p> <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> on success, <a href="https://developer.gnome.org/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> on error</p>
+<p> <code class="literal">TRUE</code> on success, <code class="literal">FALSE</code> on error</p>
 </div>
 </div>
 <hr>
 <div class="refsect2">
 <a name="gi-cclosure-marshal-generic"></a><h3>gi_cclosure_marshal_generic ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>
-gi_cclosure_marshal_generic (<em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Closures.html#GClosure"><span class="type">GClosure</span></a> *closure</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *return_gvalue</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_param_values</code></em>,
-                             <em class="parameter"><code>const <a href="https://developer.gnome.org/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *param_values</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> invocation_hint</code></em>,
-                             <em class="parameter"><code><a href="https://developer.gnome.org/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> marshal_data</code></em>);</pre>
+gi_cclosure_marshal_generic (<em class="parameter"><code><span class="type">GClosure</span> *closure</code></em>,
+                             <em class="parameter"><code><span class="type">GValue</span> *return_gvalue</code></em>,
+                             <em class="parameter"><code><span class="type">guint</span> n_param_values</code></em>,
+                             <em class="parameter"><code>const <span class="type">GValue</span> *param_values</code></em>,
+                             <em class="parameter"><code><span class="type">gpointer</span> invocation_hint</code></em>,
+                             <em class="parameter"><code><span class="type">gpointer</span> marshal_data</code></em>);</pre>
 <p>TODO</p>
 <div class="refsect3">
 <a name="id-1.4.2.2.8.25.5"></a><h4>Parameters</h4>
@@ -1237,7 +1237,7 @@
 <pre class="programlisting">#define G_IREPOSITORY_ERROR (g_irepository_error_quark ())
 </pre>
 <p>Error domain for <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a>. Errors in this domain will be from the
-<a class="link" href="GIRepository.html#GIRepositoryError" title="enum GIRepositoryError"><span class="type">GIRepositoryError</span></a> enumeration. See <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> for more information on
+<a class="link" href="GIRepository.html#GIRepositoryError" title="enum GIRepositoryError"><span class="type">GIRepositoryError</span></a> enumeration. See <span class="type">GError</span> for more information on
 error domains.</p>
 </div>
 </div>
@@ -1274,7 +1274,7 @@
 <hr>
 <div class="refsect2">
 <a name="GIRepositoryError"></a><h3>enum GIRepositoryError</h3>
-<p>An error code used with <a class="link" href="GIRepository.html#G-IREPOSITORY-ERROR:CAPS" title="G_IREPOSITORY_ERROR"><span class="type">G_IREPOSITORY_ERROR</span></a> in a <a href="https://developer.gnome.org/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> returned
+<p>An error code used with <a class="link" href="GIRepository.html#G-IREPOSITORY-ERROR:CAPS" title="G_IREPOSITORY_ERROR"><span class="type">G_IREPOSITORY_ERROR</span></a> in a <span class="type">GError</span> returned
 from a <a class="link" href="GIRepository.html" title="GIRepository"><span class="type">GIRepository</span></a> routine.</p>
 <div class="refsect3">
 <a name="id-1.4.2.2.9.4.4"></a><h4>Members</h4>
diff -Nru gobject-introspection-1.45.3/docs/reference/html/index.html gobject-introspection-1.46.0/docs/reference/html/index.html
--- gobject-introspection-1.45.3/docs/reference/html/index.html	2015-07-03 20:31:19.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/html/index.html	2015-09-22 11:27:24.000000000 +0000
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GObject Introspection Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      This document is for GObject Introspection version 1.45.3
+      This document is for GObject Introspection version 1.46.0
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://developer.gnome.org/gi/unstable/" target="_top">http://developer.gnome.org/gi/unstable/</a>.
diff -Nru gobject-introspection-1.45.3/docs/reference/Makefile.in gobject-introspection-1.46.0/docs/reference/Makefile.in
--- gobject-introspection-1.45.3/docs/reference/Makefile.in	2015-07-03 20:30:32.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/Makefile.in	2015-09-22 11:24:38.000000000 +0000
@@ -751,7 +751,7 @@
 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
 	@true
 
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -762,6 +762,17 @@
 sgml.stamp: sgml-build.stamp
 	@true
 
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo "<!ENTITY package \"$(PACKAGE)\">"; \
+		echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
+		echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
+		echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
+		echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
+		echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
+		echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
+	) > $@
+
 html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
 	$(GTK_DOC_V_HTML)rm -rf html && mkdir html && \
 	mkhtml_options=""; \
diff -Nru gobject-introspection-1.45.3/docs/reference/version.xml gobject-introspection-1.46.0/docs/reference/version.xml
--- gobject-introspection-1.45.3/docs/reference/version.xml	2015-07-03 20:30:38.000000000 +0000
+++ gobject-introspection-1.46.0/docs/reference/version.xml	2015-09-22 11:24:42.000000000 +0000
@@ -1 +1 @@
-1.45.3
+1.46.0
diff -Nru gobject-introspection-1.45.3/gir/gio-2.0.c gobject-introspection-1.46.0/gir/gio-2.0.c
--- gobject-introspection-1.45.3/gir/gio-2.0.c	2015-06-19 21:06:05.000000000 +0000
+++ gobject-introspection-1.46.0/gir/gio-2.0.c	2015-09-09 10:20:37.000000000 +0000
@@ -316,8 +316,8 @@
  *
  * In the event that the application is marked
  * %G_APPLICATION_HANDLES_COMMAND_LINE the "normal processing" will
- * send the @option dictionary to the primary instance where it can be
- * read with g_application_command_line_get_options().  The signal
+ * send the @options dictionary to the primary instance where it can be
+ * read with g_application_command_line_get_options_dict().  The signal
  * handler can modify the dictionary before returning, and the
  * modified dictionary will be sent.
  *
@@ -2176,6 +2176,31 @@
 
 
 /**
+ * GNetworkMonitor:network-metered:
+ *
+ * Whether the network is considered metered. That is, whether the
+ * system has traffic flowing through the default connection that is
+ * subject to limitations set by service providers. For example, traffic
+ * might be billed by the amount of data transmitted, or there might be a
+ * quota on the amount of traffic per month. This is typical with tethered
+ * connections (3G and 4G) and in such situations, bandwidth intensive
+ * applications may wish to avoid network activity where possible if it will
+ * cost the user money or use up their limited quota.
+ *
+ * If more information is required about specific devices then the
+ * system network management API should be used instead (for example,
+ * NetworkManager or ConnMan).
+ *
+ * If this information is not available then no networks will be
+ * marked as metered.
+ *
+ * See also #GNetworkMonitor:network-available.
+ *
+ * Since: 2.46
+ */
+
+
+/**
  * GNetworkMonitorInterface:
  * @g_iface: The parent interface.
  * @network_changed: the virtual function pointer for the
@@ -2999,6 +3024,15 @@
 
 
 /**
+ * GSocketService:active:
+ *
+ * Whether the service is currently accepting connections.
+ *
+ * Since: 2.46
+ */
+
+
+/**
  * GSrvTarget:
  *
  * A single target host/port that a network service is running on.
@@ -6997,16 +7031,6 @@
  * the names must begin with a lowercase character, must not end
  * with a '-', and must not contain consecutive dashes.
  *
- * GSettings supports change notification.  The primary mechanism to
- * watch for changes is to connect to the "changed" signal.  You can
- * optionally watch for changes on only a single key by using a signal
- * detail.  Signals are only guaranteed to be emitted for a given key
- * after you have read the value of that key while a signal handler was
- * connected for that key.  Signals may or may not be emitted in the
- * case that the key "changed" to the value that you had previously
- * read.  Signals may be reported in additional cases as well and the
- * "changed" signal should really be treated as "may have changed".
- *
  * Similar to GConf, the default values in GSettings schemas can be
  * localized, but the localized values are stored in gettext catalogs
  * and looked up with the domain that is specified in the
@@ -10867,6 +10891,16 @@
 
 
 /**
+ * _g_poll_file_monitor_new:
+ * @file: a #GFile.
+ *
+ * Polls @file for changes.
+ *
+ * Returns: a new #GFileMonitor for the given #GFile.
+ */
+
+
+/**
  * g_action_activate:
  * @action: a #GAction
  * @parameter: (allow-none): the parameter to the activation
@@ -15423,6 +15457,13 @@
  * message. Similary, if a filter consumes an outgoing message, the
  * message will not be sent to the other peer.
  *
+ * If @user_data_free_func is non-%NULL, it will be called (in the
+ * thread-default main context of the thread you are calling this
+ * method from) at some point after @user_data is no longer
+ * needed. (It is not guaranteed to be called synchronously when the
+ * filter is removed, and may be called after @connection has been
+ * destroyed.)
+ *
  * Returns: a filter identifier that can be used with
  *     g_dbus_connection_remove_filter()
  * Since: 2.26
@@ -16179,6 +16220,25 @@
 
 
 /**
+ * g_dbus_connection_register_object_with_closures: (rename-to g_dbus_connection_register_object)
+ * @connection: A #GDBusConnection.
+ * @object_path: The object path to register at.
+ * @interface_info: Introspection data for the interface.
+ * @method_call_closure: (nullable): #GClosure for handling incoming method calls.
+ * @get_property_closure: (nullable): #GClosure for getting a property.
+ * @set_property_closure: (nullable): #GClosure for setting a property.
+ * @error: Return location for error or %NULL.
+ *
+ * Version of g_dbus_connection_register_object() using closures instead of a
+ * #GDBusInterfaceVTable for easier binding in other languages.
+ *
+ * Returns: 0 if @error is set, otherwise a registration id (never 0)
+ * that can be used with g_dbus_connection_unregister_object() .
+ * Since: 2.46
+ */
+
+
+/**
  * g_dbus_connection_register_subtree:
  * @connection: a #GDBusConnection
  * @object_path: the object path to register the subtree at
@@ -16237,6 +16297,13 @@
  *
  * Removes a filter.
  *
+ * Note that since filters run in a different thread, there is a race
+ * condition where it is possible that the filter will be running even
+ * after calling g_dbus_connection_remove_filter(), so you cannot just
+ * free data that the filter might be using. Instead, you should pass
+ * a #GDestroyNotify to g_dbus_connection_add_filter(), which will be
+ * called when it is guaranteed that the data is no longer needed.
+ *
  * Since: 2.26
  */
 
@@ -16426,7 +16493,8 @@
  *     all object paths
  * @arg0: (allow-none): contents of first string argument to match on or %NULL
  *     to match on all kinds of arguments
- * @flags: flags describing how to subscribe to the signal (currently unused)
+ * @flags: #GDBusSignalFlags describing how arg0 is used in subscribing to the
+ *     signal
  * @callback: callback to invoke when there is a signal matching the requested data
  * @user_data: user data to pass to @callback
  * @user_data_free_func: (allow-none): function to free @user_data with when
@@ -16452,6 +16520,13 @@
  * interpreted as part of a namespace or path.  The first argument
  * of a signal is matched against that part as specified by D-Bus.
  *
+ * If @user_data_free_func is non-%NULL, it will be called (in the
+ * thread-default main context of the thread you are calling this
+ * method from) at some point after @user_data is no longer
+ * needed. (It is not guaranteed to be called synchronously when the
+ * signal is unsubscribed from, and may be called after @connection
+ * has been destroyed.)
+ *
  * Returns: a subscription identifier that can be used with g_dbus_connection_signal_unsubscribe()
  * Since: 2.26
  */
@@ -21415,7 +21490,8 @@
  * g_file_get_path:
  * @file: input #GFile
  *
- * Gets the local pathname for #GFile, if one exists.
+ * Gets the local pathname for #GFile, if one exists. If non-%NULL, this is
+ * guaranteed to be an absolute, canonical path. It might contain symlinks.
  *
  * This call does no blocking I/O.
  *
@@ -21483,10 +21559,10 @@
  *
  * If @parent is %NULL then this function returns %TRUE if @file has any
  * parent at all.  If @parent is non-%NULL then %TRUE is only returned
- * if @file is a child of @parent.
+ * if @file is an immediate child of @parent.
  *
- * Returns: %TRUE if @file is a child of @parent (or any parent in the
- *          case that @parent is %NULL).
+ * Returns: %TRUE if @file is an immediate child of @parent (or any parent in
+ *          the case that @parent is %NULL).
  * Since: 2.24
  */
 
@@ -26341,6 +26417,18 @@
 
 
 /**
+ * g_list_store_sort:
+ * @store: a #GListStore
+ * @compare_func: (scope call): pairwise comparison function for sorting
+ * @user_data: (closure): user data for @compare_func
+ *
+ * Sort the items in @store according to @compare_func.
+ *
+ * Since: 2.46
+ */
+
+
+/**
  * g_list_store_splice:
  * @store: a #GListStore
  * @position: the position at which to make the change
@@ -28450,6 +28538,18 @@
 
 
 /**
+ * g_network_monitor_get_network_metered:
+ * @monitor: the #GNetworkMonitor
+ *
+ * Checks if the network is metered.
+ * See #GNetworkMonitor:network-metered for more details.
+ *
+ * Returns: whether the connection is metered
+ * Since: 2.46
+ */
+
+
+/**
  * g_network_service_get_domain:
  * @srv: a #GNetworkService
  *
@@ -29448,16 +29548,6 @@
 
 
 /**
- * g_poll_file_monitor_new:
- * @file: a #GFile.
- *
- * Polls @file for changes.
- *
- * Returns: a new #GFileMonitor for the given #GFile.
- */
-
-
-/**
  * g_pollable_input_stream_can_poll:
  * @stream: a #GPollableInputStream.
  *
@@ -30432,6 +30522,9 @@
  * The return result is a %NULL terminated list of strings which should
  * be released with g_strfreev().
  *
+ * If @path is invalid or does not exist in the #GResource,
+ * %G_RESOURCE_ERROR_NOT_FOUND will be returned.
+ *
  * @lookup_flags controls the behaviour of the lookup.
  *
  * Returns: (array zero-terminated=1) (transfer full): an array of constant strings
@@ -34743,6 +34836,9 @@
  * On success, the returned #GSocket takes ownership of @fd. On failure, the
  * caller must close @fd themselves.
  *
+ * Since GLib 2.46, it is no longer a fatal error to call this on a non-socket
+ * descriptor.  Instead, a GError will be set with code %G_IO_ERROR_FAILED
+ *
  * Returns: a #GSocket or %NULL on error.
  *     Free the returned object with g_object_unref().
  * Since: 2.22
diff -Nru gobject-introspection-1.45.3/gir/glib-2.0.c gobject-introspection-1.46.0/gir/glib-2.0.c
--- gobject-introspection-1.45.3/gir/glib-2.0.c	2015-07-03 11:46:47.000000000 +0000
+++ gobject-introspection-1.46.0/gir/glib-2.0.c	2015-09-22 11:22:55.000000000 +0000
@@ -6956,6 +6956,35 @@
  * On UNIX, the GLib mainloop is incompatible with fork(). Any program
  * using the mainloop must either exec() or exit() from the child
  * without returning to the mainloop.
+ *
+ * ## Memory management of sources # {#mainloop-memory-management}
+ *
+ * There are two options for memory management of the user data passed to a
+ * #GSource to be passed to its callback on invocation. This data is provided
+ * in calls to g_timeout_add(), g_timeout_add_full(), g_idle_add(), etc. and
+ * more generally, using g_source_set_callback(). This data is typically an
+ * object which ‘owns’ the timeout or idle callback, such as a widget or a
+ * network protocol implementation. In many cases, it is an error for the
+ * callback to be invoked after this owning object has been destroyed, as that
+ * results in use of freed memory.
+ *
+ * The first, and preferred, option is to store the source ID returned by
+ * functions such as g_timeout_add() or g_source_attach(), and explicitly
+ * remove that source from the main context using g_source_remove() when the
+ * owning object is finalized. This ensures that the callback can only be
+ * invoked while the object is still alive.
+ *
+ * The second option is to hold a strong reference to the object in the
+ * callback, and to release it in the callback’s #GDestroyNotify. This ensures
+ * that the object is kept alive until after the source is finalized, which is
+ * guaranteed to be after it is invoked for the final time. The #GDestroyNotify
+ * is another callback passed to the ‘full’ variants of #GSource functions (for
+ * example, g_timeout_add_full()). It is called when the source is finalized,
+ * and is designed for releasing references like this.
+ *
+ * One important caveat of this second approach is that it will keep the object
+ * alive indefinitely if the main loop is stopped before the #GSource is
+ * invoked, which may be undesirable.
  */
 
 
@@ -7023,7 +7052,7 @@
  * g_slice_free(), plain malloc() with free(), and (if you're using C++)
  * new with delete and new[] with delete[]. Otherwise bad things can happen,
  * since these allocators may use different memory pools (and new/delete call
- * constructors and destructors). See also g_mem_set_vtable().
+ * constructors and destructors).
  */
 
 
@@ -7585,6 +7614,13 @@
  * certain number of columns, then \%Ns is not a correct solution
  * anyway, since it fails to take wide characters (see g_unichar_iswide())
  * into account.
+ *
+ * Note also that there are various printf() parameters which are platform
+ * dependent. GLib provides platform independent macros for these parameters
+ * which should be used instead. A common example is %G_GUINT64_FORMAT, which
+ * should be used instead of `%llu` or similar parameters for formatting
+ * 64-bit integers. These macros are all named `G_*_FORMAT`; see
+ * [Basic Types][glib-Basic-Types].
  */
 
 
@@ -7641,11 +7677,11 @@
  * "assertions", which consists of running the test_assertions function.
  *
  * In addition to the traditional g_assert(), the test framework provides
- * an extended set of assertions for string and numerical comparisons:
- * g_assert_cmpfloat(), g_assert_cmpint(), g_assert_cmpuint(),
- * g_assert_cmphex(), g_assert_cmpstr(). The advantage of these variants
- * over plain g_assert() is that the assertion messages can be more
- * elaborate, and include the values of the compared entities.
+ * an extended set of assertions for comparisons: g_assert_cmpfloat(),
+ * g_assert_cmpint(), g_assert_cmpuint(), g_assert_cmphex(),
+ * g_assert_cmpstr(), and g_assert_cmpmem(). The advantage of these
+ * variants over plain g_assert() is that the assertion messages can be
+ * more elaborate, and include the values of the compared entities.
  *
  * GLib ships with two utilities called [gtester][gtester] and
  * [gtester-report][gtester-report] to facilitate running tests and producing
@@ -7837,6 +7873,20 @@
  * and #GAsyncQueue, which are thread-safe and need no further
  * application-level locking to be accessed from multiple threads.
  * Most refcounting functions such as g_object_ref() are also thread-safe.
+ *
+ * A common use for #GThreads is to move a long-running blocking operation out
+ * of the main thread and into a worker thread. For GLib functions, such as
+ * single GIO operations, this is not necessary, and complicates the code.
+ * Instead, the `…_async()` version of the function should be used from the main
+ * thread, eliminating the need for locking and synchronisation between multiple
+ * threads. If an operation does need to be moved to a worker thread, consider
+ * using g_task_run_in_thread(), or a #GThreadPool. #GThreadPool is often a
+ * better choice than #GThread, as it handles thread reuse and task queueing;
+ * #GTask uses this internally.
+ *
+ * However, if multiple blocking operations need to be performed in sequence,
+ * and it is not possible to use #GTask for them, moving them to a worker thread
+ * can clarify the code.
  */
 
 
@@ -8992,6 +9042,30 @@
 
 
 /**
+ * g_assert_cmpmem:
+ * @m1: pointer to a buffer
+ * @l1: length of @m1
+ * @m2: pointer to another buffer
+ * @l2: length of @m2
+ *
+ * Debugging macro to compare memory regions. If the comparison fails,
+ * an error message is logged and the application is either terminated
+ * or the testcase marked as failed.
+ *
+ * The effect of `g_assert_cmpmem (m1, l1, m2, l2)` is
+ * the same as `g_assert_true (l1 == l2 && memcmp (m1, m2, l1) == 0)`.
+ * The advantage of this macro is that it can produce a message that
+ * includes the actual values of @l1 and @l2.
+ *
+ * |[<!-- language="C" -->
+ *   g_assert_cmpmem (buf->data, buf->len, expected, sizeof (expected));
+ * ]|
+ *
+ * Since: 2.46
+ */
+
+
+/**
  * g_assert_cmpstr:
  * @s1: a string (may be %NULL)
  * @cmp: The comparison operator to use.
@@ -9373,7 +9447,7 @@
  * @queue: a #GAsyncQueue
  * @data: the @data to remove from the @queue
  *
- * Remove an item from the queue. This function does not block.
+ * Remove an item from the queue.
  *
  * Returns: %TRUE if the item was removed
  * Since: 2.46
@@ -9385,7 +9459,7 @@
  * @queue: a #GAsyncQueue
  * @data: the @data to remove from the @queue
  *
- * Remove an item from the queue. This function does not block.
+ * Remove an item from the queue.
  *
  * This function must be called while holding the @queue's lock.
  *
@@ -10223,7 +10297,8 @@
  * from 0 (least significant) to sizeof(#gulong) * 8 - 1 (31 or 63,
  * usually). To start searching from the 0th bit, set @nth_bit to -1.
  *
- * Returns: the index of the first bit set which is higher than @nth_bit
+ * Returns: the index of the first bit set which is higher than @nth_bit, or -1
+ *    if no higher bits are set
  */
 
 
@@ -10238,7 +10313,8 @@
  * usually). To start searching from the last bit, set @nth_bit to
  * -1 or GLIB_SIZEOF_LONG * 8.
  *
- * Returns: the index of the first bit set which is lower than @nth_bit
+ * Returns: the index of the first bit set which is lower than @nth_bit, or -1
+ *    if no lower bits are set
  */
 
 
@@ -14450,6 +14526,10 @@
  *
  * A convenience function/macro to log an error message.
  *
+ * This is not intended for end user error reporting. Use of #GError is
+ * preferred for that instead, as it allows calling functions to perform actions
+ * conditional on the type of error.
+ *
  * Error messages are always fatal, resulting in a call to
  * abort() to terminate the application. This function will
  * result in a core dump; don't use it for errors you expect.
@@ -16018,7 +16098,7 @@
  * If you supplied a @key_destroy_func when creating the
  * #GHashTable, the old key is freed using that function.
  *
- * Returns: %TRUE of the key did not exist yet
+ * Returns: %TRUE if the key did not exist yet
  */
 
 
@@ -16646,6 +16726,9 @@
  * returns %FALSE it is automatically removed from the list of event
  * sources and will not be called again.
  *
+ * See [memory management of sources][mainloop-memory-management] for details
+ * on how to handle the return value and memory management of @data.
+ *
  * This internally creates a main loop source using g_idle_source_new()
  * and attaches it to the global #GMainContext using g_source_attach(), so
  * the callback will be invoked in whichever thread is running that main
@@ -16668,6 +16751,9 @@
  * events pending.  If the function returns %FALSE it is automatically
  * removed from the list of event sources and will not be called again.
  *
+ * See [memory management of sources][mainloop-memory-management] for details
+ * on how to handle the return value and memory management of @data.
+ *
  * This internally creates a main loop source using g_idle_source_new()
  * and attaches it to the global #GMainContext using g_source_attach(), so
  * the callback will be invoked in whichever thread is running that main
@@ -20688,25 +20774,20 @@
  * This function is useful for avoiding an extra copy of allocated memory returned
  * by a non-GLib-based API.
  *
- * A different allocator can be set using g_mem_set_vtable().
- *
  * Returns: if %TRUE, malloc() and g_malloc() can be mixed.
+ * Deprecated: 2.46: GLib always uses the system malloc, so this function always
+ * returns %TRUE.
  */
 
 
 /**
  * g_mem_profile:
  *
- * Outputs a summary of memory usage.
- *
- * It outputs the frequency of allocations of different sizes,
- * the total number of bytes which have been allocated,
- * the total number of bytes which have been freed,
- * and the difference between the previous two values, i.e. the number of bytes
- * still in use.
+ * GLib used to support some tools for memory profiling, but this
+ * no longer works. There are many other useful tools for memory
+ * profiling these days which can be used instead.
  *
- * Note that this function will not output anything unless you have
- * previously installed the #glib_mem_profiler_table with g_mem_set_vtable().
+ * Deprecated: 2.46: Use other memory profiling tools instead
  */
 
 
@@ -20714,17 +20795,12 @@
  * g_mem_set_vtable:
  * @vtable: table of memory allocation routines.
  *
- * Sets the #GMemVTable to use for memory allocation. You can use this
- * to provide custom memory allocation routines.
+ * This function used to let you override the memory allocation function.
+ * However, its use was incompatible with the use of global constructors
+ * in GLib and GIO, because those use the GLib allocators before main is
+ * reached. Therefore this function is now deprecated and is just a stub.
  *
- * The @vtable only needs to provide malloc(), realloc(), and free()
- * functions; GLib can provide default implementations of the others.
- * The malloc() and realloc() implementations should return %NULL on
- * failure, GLib will handle error-checking for you. @vtable is copied,
- * so need not persist after this function has been called.
- *
- * Note that this function must be called before using any other GLib
- * functions.
+ * Deprecated: 2.46: Use other memory profiling tools instead
  */
 
 
@@ -26709,6 +26785,9 @@
  * should not count on @func being called with @data as its first
  * parameter.
  *
+ * See [memory management of sources][mainloop-memory-management] for details
+ * on how to handle memory management of @data.
+ *
  * Typically, you won't use this function. Instead use functions specific
  * to the type of source you are using.
  */
@@ -26952,13 +27031,8 @@
  * main(). wmain() has a wide character argument vector as parameter.
  *
  * At least currently, mingw doesn't support wmain(), so if you use
- * mingw to develop the spawned program, it will have to call the
- * undocumented function __wgetmainargs() to get the wide character
- * argument vector and environment. See gspawn-win32-helper.c in the
- * GLib sources or init.c in the mingw runtime sources for a prototype
- * for that function. Alternatively, you can retrieve the Win32 system
- * level wide character command line passed to the spawned program
- * using the GetCommandLineW() function.
+ * mingw to develop the spawned program, it should call
+ * g_win32_get_command_line() to get arguments in UTF-8.
  *
  * On Windows the low-level child process creation API CreateProcess()
  * doesn't use argument vectors, but a command line. The C runtime
@@ -27356,6 +27430,10 @@
  * It can be passed to g_hash_table_new() as the @hash_func parameter,
  * when using non-%NULL strings as keys in a #GHashTable.
  *
+ * Note that this function may not be a perfect fit for all use cases.
+ * For example, it produces some hash collisions with strings as short
+ * as 2.
+ *
  * Returns: a hash value corresponding to the key
  */
 
@@ -27675,13 +27753,17 @@
  * @errnum: the system error number. See the standard C %errno
  *     documentation
  *
- * Returns a string corresponding to the given error code, e.g.
- * "no such process". You should use this function in preference to
- * strerror(), because it returns a string in UTF-8 encoding, and since
- * not all platforms support the strerror() function.
+ * Returns a string corresponding to the given error code, e.g. "no
+ * such process". Unlike strerror(), this always returns a string in
+ * UTF-8 encoding, and the pointer is guaranteed to remain valid for
+ * the lifetime of the process.
+ *
+ * Note that the string may be translated according to the current locale.
+ *
+ * The value of %errno will not be changed by this function.
  *
  * Returns: a UTF-8 string describing the error code. If the error code
- *     is unknown, it returns "unknown error (<code>)".
+ *     is unknown, it returns a string like "unknown error (<code>)".
  */
 
 
@@ -27996,7 +28078,7 @@
 
 /**
  * g_string_free:
- * @string: a #GString
+ * @string: (transfer full): a #GString
  * @free_segment: if %TRUE, the actual character data is freed as well
  *
  * Frees the memory allocated for the #GString.
@@ -29795,6 +29877,10 @@
  * If the thread can not be created the program aborts. See
  * g_thread_try_new() if you want to attempt to deal with failures.
  *
+ * If you are using threads to offload (potentially many) short-lived tasks,
+ * #GThreadPool may be more appropriate than manually spawning and tracking
+ * multiple #GThreads.
+ *
  * To free the struct returned by this function, use g_thread_unref().
  * Note that g_thread_join() implicitly unrefs the #GThread as well.
  *
@@ -30463,6 +30549,9 @@
  * timeout is recalculated based on the current time and the given interval
  * (it does not try to 'catch up' time lost in delays).
  *
+ * See [memory management of sources][mainloop-memory-management] for details
+ * on how to handle the return value and memory management of @data.
+ *
  * If you want to have a timer in the "seconds" range and do not care
  * about the exact time of the first call of the timer, use the
  * g_timeout_add_seconds() function; this function allows for more
@@ -30504,6 +30593,9 @@
  * timeout is recalculated based on the current time and the given interval
  * (it does not try to 'catch up' time lost in delays).
  *
+ * See [memory management of sources][mainloop-memory-management] for details
+ * on how to handle the return value and memory management of @data.
+ *
  * This internally creates a main loop source using g_timeout_source_new()
  * and attaches it to the global #GMainContext using g_source_attach(), so
  * the callback will be invoked in whichever thread is running that main
@@ -30537,6 +30629,9 @@
  * of one second. If you need finer precision and have such a timeout,
  * you may want to use g_timeout_add() instead.
  *
+ * See [memory management of sources][mainloop-memory-management] for details
+ * on how to handle the return value and memory management of @data.
+ *
  * The interval given is in terms of monotonic time, not wall clock
  * time.  See g_get_monotonic_time().
  *
@@ -30572,6 +30667,9 @@
  * After each call to the timeout function, the time of the next
  * timeout is recalculated based on the current time and the given @interval
  *
+ * See [memory management of sources][mainloop-memory-management] for details
+ * on how to handle the return value and memory management of @data.
+ *
  * If you want timing more precise than whole seconds, use g_timeout_add()
  * instead.
  *
@@ -33641,7 +33739,7 @@
  * type.  This includes the types %G_VARIANT_TYPE_STRING,
  * %G_VARIANT_TYPE_OBJECT_PATH and %G_VARIANT_TYPE_SIGNATURE.
  *
- * The string will always be UTF-8 encoded.
+ * The string will always be UTF-8 encoded, and will never be %NULL.
  *
  * If @length is non-%NULL then the length of the string (in bytes) is
  * returned there.  For trusted values, this information is already
@@ -34679,7 +34777,9 @@
  *
  * Creates a string #GVariant with the contents of @string.
  *
- * @string must be valid UTF-8.
+ * @string must be valid UTF-8, and must not be %NULL. To encode
+ * potentially-%NULL strings, use g_variant_new() with `ms` as the
+ * [format string][gvariant-format-strings-maybe-types].
  *
  * Returns: (transfer none): a floating reference to a new string #GVariant instance
  * Since: 2.24
@@ -34707,7 +34807,8 @@
  *
  * Creates a string #GVariant with the contents of @string.
  *
- * @string must be valid UTF-8.
+ * @string must be valid UTF-8, and must not be %NULL. To encode
+ * potentially-%NULL strings, use this with g_variant_new_maybe().
  *
  * This function consumes @string.  g_free() will be called on @string
  * when it is no longer required.
@@ -35750,6 +35851,10 @@
  *
  * A convenience function/macro to log a warning message.
  *
+ * This is not intended for end user error reporting. Use of #GError is
+ * preferred for that instead, as it allows calling functions to perform actions
+ * conditional on the type of error.
+ *
  * You can make warnings fatal at runtime by setting the `G_DEBUG`
  * environment variable (see
  * [Running GLib Applications](glib-running.html)).
@@ -36227,10 +36332,7 @@
 /**
  * glib_mem_profiler_table:
  *
- * A #GMemVTable containing profiling variants of the memory
- * allocation functions. Use them together with g_mem_profile()
- * in order to get information about the memory allocation pattern
- * of your program.
+ * Deprecated: 2.46: Use other memory profiling tools instead
  */
 
 
diff -Nru gobject-introspection-1.45.3/gir/gobject-2.0.c gobject-introspection-1.46.0/gir/gobject-2.0.c
--- gobject-introspection-1.45.3/gir/gobject-2.0.c	2015-07-03 11:46:47.000000000 +0000
+++ gobject-introspection-1.46.0/gir/gobject-2.0.c	2015-09-22 11:22:55.000000000 +0000
@@ -441,10 +441,10 @@
  * separately (typically by using #GArray or #GPtrArray) and put a pointer
  * to the buffer in the structure.
  *
- * A final word about type names: Such an identifier needs to be at least
- * three characters long. There is no upper length limit. The first character
- * needs to be a letter (a-z or A-Z) or an underscore '_'. Subsequent
- * characters can be letters, numbers or any of '-_+'.
+ * As mentioned in the [GType conventions][gtype-conventions], type names must
+ * be at least three characters long. There is no upper length limit. The first
+ * character must be a letter (a–z or A–Z) or an underscore (‘_’). Subsequent
+ * characters can be letters, numbers or any of ‘-_+’.
  */
 
 
@@ -551,6 +551,12 @@
  * construction and destruction, property access methods, and signal
  * support.  Signals are described in detail [here][gobject-Signals].
  *
+ * For a tutorial on implementing a new GObject class, see [How to define and
+ * implement a new GObject][howto-gobject]. For a list of naming conventions for
+ * GObjects and their methods, see the [GType conventions][gtype-conventions].
+ * For the high-level concepts behind GObject, read [Instantiable classed types:
+ * Objects][gtype-instantiable-classed].
+ *
  * ## Floating references # {#floating-ref}
  *
  * GInitiallyUnowned is derived from GObject. The only difference between
@@ -686,6 +692,32 @@
  * Specification of no detail argument for signal handlers (omission of the
  * detail part of the signal specification upon connection) serves as a
  * wildcard and matches any detail argument passed in to emission.
+ *
+ * ## Memory management of signal handlers # {#signal-memory-management}
+ *
+ * If you are connecting handlers to signals and using a #GObject instance as
+ * your signal handler user data, you should remember to pair calls to
+ * g_signal_connect() with calls to g_signal_handler_disconnect() or
+ * g_signal_handlers_disconnect_by_func(). While signal handlers are
+ * automatically disconnected when the object emitting the signal is finalised,
+ * they are not automatically disconnected when the signal handler user data is
+ * destroyed. If this user data is a #GObject instance, using it from a
+ * signal handler after it has been finalised is an error.
+ *
+ * There are two strategies for managing such user data. The first is to
+ * disconnect the signal handler (using g_signal_handler_disconnect() or
+ * g_signal_handlers_disconnect_by_func()) when the user data (object) is
+ * finalised; this has to be implemented manually. For non-threaded programs,
+ * g_signal_connect_object() can be used to implement this automatically.
+ * Currently, however, it is unsafe to use in threaded programs.
+ *
+ * The second is to hold a strong reference on the user data until after the
+ * signal is disconnected for other reasons. This can be implemented
+ * automatically using g_signal_connect_data().
+ *
+ * The first approach is recommended, as the second approach can result in
+ * effective memory leaks of the user data if the signal handler is never
+ * disconnected for some reason.
  */
 
 
@@ -3502,11 +3534,11 @@
 
 /**
  * g_param_spec_get_default_value:
- * @param: a #GParamSpec
+ * @pspec: a #GParamSpec
  *
- * Gets the default value of @param as a pointer to a #GValue.
+ * Gets the default value of @pspec as a pointer to a #GValue.
  *
- * The #GValue will remain value for the life of @param.
+ * The #GValue will remain value for the life of @pspec.
  *
  * Returns: a pointer to a #GValue which must not be modified
  * Since: 2.38
@@ -3526,6 +3558,17 @@
  */
 
 
+/**
+ * g_param_spec_get_name_quark:
+ * @param: a #GParamSpec
+ *
+ * Gets the GQuark for the name.
+ *
+ * Returns: the GQuark for @pspec->name.
+ * Since: 2.46
+ */
+
+
 /**
  * g_param_spec_get_nick:
  * @pspec: a valid #GParamSpec
diff -Nru gobject-introspection-1.45.3/girepository/girepository.c gobject-introspection-1.46.0/girepository/girepository.c
--- gobject-introspection-1.45.3/girepository/girepository.c	2015-05-20 20:26:37.000000000 +0000
+++ gobject-introspection-1.46.0/girepository/girepository.c	2015-07-30 10:32:27.000000000 +0000
@@ -739,7 +739,6 @@
 typedef struct {
   const gchar *gtype_name;
   GITypelib *result_typelib;
-  gboolean found_prefix;
 } FindByGTypeData;
 
 static DirEntry *
@@ -757,8 +756,6 @@
         {
           if (!g_typelib_matches_gtype_name_prefix (typelib, data->gtype_name))
             continue;
-
-          data->found_prefix = TRUE;
         }
 
       ret = g_typelib_get_dir_entry_by_gtype_name (typelib, data->gtype_name);
@@ -805,7 +802,6 @@
 
   data.gtype_name = g_type_name (gtype);
   data.result_typelib = NULL;
-  data.found_prefix = FALSE;
 
   /* Inside each typelib, we include the "C prefix" which acts as
    * a namespace mechanism.  For GtkTreeView, the C prefix is Gtk.
@@ -818,13 +814,6 @@
   if (entry == NULL)
     entry = find_by_gtype (repository->priv->lazy_typelibs, &data, TRUE);
 
-  /* If we have no result, but we did find a typelib claiming to
-   * offer bindings for such a prefix, bail out now on the assumption
-   * that a more exhaustive search would not produce any results.
-   */
-  if (entry == NULL && data.found_prefix)
-      return NULL;
-
   /* Not ever class library necessarily specifies a correct c_prefix,
    * so take a second pass. This time we will try a global lookup,
    * ignoring prefixes.
diff -Nru gobject-introspection-1.45.3/giscanner/cachestore.py gobject-introspection-1.46.0/giscanner/cachestore.py
--- gobject-introspection-1.45.3/giscanner/cachestore.py	2015-07-03 11:46:48.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/cachestore.py	2015-08-21 12:03:01.000000000 +0000
@@ -64,7 +64,8 @@
         current_hash = _get_versionhash()
         version = os.path.join(self._directory, _CACHE_VERSION_FILENAME)
         try:
-            cache_hash = open(version).read()
+            with open(version, 'r') as version_file:
+                cache_hash = version_file.read()
         except IOError as e:
             # File does not exist
             if e.errno == errno.ENOENT:
@@ -75,11 +76,16 @@
         if current_hash == cache_hash:
             return
 
-        versiontmp = version + '.tmp'
-
         self._clean()
+
+        tmp_fd, tmp_filename = tempfile.mkstemp(prefix='g-ir-scanner-cache-version-')
         try:
-            fp = open(versiontmp, 'w')
+            with os.fdopen(tmp_fd, 'w') as tmp_file:
+                tmp_file.write(current_hash)
+
+            # On Unix, this would just be os.rename() but Windows
+            # doesn't allow that.
+            shutil.move(tmp_filename, version)
         except IOError as e:
             # Permission denied
             if e.errno == errno.EACCES:
@@ -87,12 +93,6 @@
             else:
                 raise
 
-        fp.write(current_hash)
-        fp.close()
-        # On Unix, this would just be os.rename() but Windows
-        # doesn't allow that.
-        shutil.move(versiontmp, version)
-
     def _get_filename(self, filename):
         # If we couldn't create the directory we're probably
         # on a read only home directory where we just disable
@@ -138,7 +138,8 @@
 
         tmp_fd, tmp_filename = tempfile.mkstemp(prefix='g-ir-scanner-cache-')
         try:
-            cPickle.dump(data, os.fdopen(tmp_fd, 'w'))
+            with os.fdopen(tmp_fd, 'w') as tmp_file:
+                cPickle.dump(data, tmp_file)
         except IOError as e:
             # No space left on device
             if e.errno == errno.ENOSPC:
diff -Nru gobject-introspection-1.45.3/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py
--- gobject-introspection-1.45.3/giscanner/ccompiler.py	2015-07-03 11:46:48.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/ccompiler.py	2015-09-09 10:20:37.000000000 +0000
@@ -21,6 +21,14 @@
 import os
 import subprocess
 
+import sys
+import distutils
+
+from distutils.msvccompiler import MSVCCompiler
+from distutils.unixccompiler import UnixCCompiler
+from distutils.cygwinccompiler import Mingw32CCompiler
+from distutils.sysconfig import customize_compiler
+
 from . import utils
 
 
@@ -30,93 +38,231 @@
     compiler = None
     _cflags_no_deprecation_warnings = ''
 
-    def __init__(self, compiler_name=None):
-        pass
+    def __init__(self,
+                 environ=os.environ,
+                 osname=os.name,
+                 compiler_name=None):
+
+        if osname == 'nt':
+            # The compiler used here on Windows may well not be
+            # the same compiler that was used to build Python,
+            # as the official Python binaries are built with
+            # Visual Studio
+            if compiler_name is None:
+                if environ.get('MSYSTEM') == 'MINGW32' or environ.get('MSYSTEM') == 'MINGW64':
+                    compiler_name = 'mingw32'
+                else:
+                    compiler_name = distutils.ccompiler.get_default_compiler()
+            if compiler_name != 'msvc' and \
+               compiler_name != 'mingw32':
+                raise SystemExit('Specified Compiler \'%s\' is unsupported.' % compiler_name)
+        else:
+            # XXX: Is it common practice to use a non-Unix compiler
+            #      class instance on non-Windows on platforms g-i supports?
+            compiler_name = distutils.ccompiler.get_default_compiler()
+
+        # Now, create the distutils ccompiler instance based on the info we have.
+        if compiler_name == 'msvc':
+            # For MSVC, we need to create a instance of a subclass of distutil's
+            # MSVC9Compiler class, as it does not provide a preprocess()
+            # implementation
+            from . import msvccompiler
+            self.compiler = msvccompiler.get_msvc_compiler()
+
+        else:
+            self.compiler = distutils.ccompiler.new_compiler(compiler=compiler_name)
+        customize_compiler(self.compiler)
+
+        # customize_compiler() from distutils only does customization
+        # for 'unix' compiler type.  Also, avoid linking to msvcrxx.dll
+        # for MinGW builds as the dumper binary does not link to the
+        # Python DLL, but link to msvcrt.dll if necessary.
+        if isinstance(self.compiler, Mingw32CCompiler):
+            if self.compiler.dll_libraries != ['msvcrt']:
+                self.compiler.dll_libraries = []
+            if self.compiler.preprocessor is None:
+                self.compiler.preprocessor = self.compiler.compiler + ['-E']
+
+        if self.check_is_msvc():
+            # We trick distutils to believe that we are (always) using a
+            # compiler supplied by a Windows SDK, so that we avoid launching
+            # a new build environment to detect the compiler that is used to
+            # build Python itself, which is not desirable, so that we use the
+            # compiler commands (and env) as-is.
+            os.environ['DISTUTILS_USE_SDK'] = '1'
+            if 'MSSdk' not in os.environ:
+                if 'WindowsSDKDir' in os.environ:
+                    os.environ['MSSdk'] = os.environ.get('WindowsSDKDir')
+                elif os.environ.get('VCInstallDir'):
+                    os.environ['MSSdk'] = os.environ.get('VCInstallDir')
 
-    def get_internal_link_flags(self,
-                                args,
-                                libtool,
-                                libraries,
-                                libpaths,
-                                pkgconfig_msvc_flags,
-                                ns,
-                                ns_version):
+            self.compiler_cmd = 'cl.exe'
+
+            self._cflags_no_deprecation_warnings = "-wd4996"
+        else:
+            if (isinstance(self.compiler, Mingw32CCompiler)):
+                self.compiler_cmd = self.compiler.compiler[0]
+            else:
+                self.compiler_cmd = ' '.join(self.compiler.compiler)
+
+            self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
+
+    def get_internal_link_flags(self, args, libtool, libraries, libpaths):
         # An "internal" link is where the library to be introspected
         # is being built in the current directory.
 
-        # Search the current directory first
-        # (This flag is not supported nor needed for Visual C++)
-        if pkgconfig_msvc_flags == '':
-            args.append('-L.')
-
-        # https://bugzilla.gnome.org/show_bug.cgi?id=625195
         if not libtool:
-            # We don't have -Wl,-rpath for Visual C++, and that's
-            # going to cause a problem.  Instead, link to internal
-            # libraries by deducing the .lib file name using
-            # the namespace name and version
-            if pkgconfig_msvc_flags:
-                if ns_version:
-                    args.append(str.lower(ns) +
-                                '-' +
-                                ns_version + '.lib')
-                else:
-                    args.append(str.lower(ns) + '.lib')
+            # non-libtool case: prepare distutils use
+            if self.check_is_msvc():
+                for library in libraries:
+                    # MSVC Builds don't use libtool, so no .la libraries,
+                    # so just add the library directly.
+                    self.compiler.add_library(library)
+                    for libpath in libpaths:
+                        self.compiler.add_library_dir(libpath)
             else:
+                # Search the current directory first
+                # (This flag is not supported nor needed for Visual C++)
+                self.compiler.add_library_dir('.')
+                if os.name != 'nt':
+                    self.compiler.add_runtime_library_dir('.')
+
+                # https://bugzilla.gnome.org/show_bug.cgi?id=625195
                 args.append('-Wl,-rpath=.')
 
-        # Ensure libraries are always linked as we are going to use ldd to work
-        # out their names later
-        if not libtool and pkgconfig_msvc_flags == '':
-            args.append('-Wl,--no-as-needed')
+                # Ensure libraries are always linked as we are going to use ldd to work
+                # out their names later
+                args.append('-Wl,--no-as-needed')
+
+            for library in libraries:
+                self.compiler.add_library(library)
+            if not self.check_is_msvc():
+                for library_path in libpaths:
+                    args.append('-L' + library_path)
+                    if os.path.isabs(library_path):
+                        args.append('-Wl,-rpath=' + library_path)
 
-        for library in libraries:
-            # Visual C++: We have the needed .lib files now, and we need to link
-            # to .lib files, not the .dll as the --library option specifies the
-            # .dll(s) the .gir file refers to
-            if pkgconfig_msvc_flags == '':
+        else:
+            # libtool case: assemble linker command arguments, like we did before
+            args.append('-L.')
+            for library in libraries:
                 if library.endswith(".la"):  # explicitly specified libtool library
                     args.append(library)
                 else:
                     args.append('-l' + library)
 
-        for library_path in libpaths:
-            # Not used/needed on Visual C++, and -Wl,-rpath options
-            # will cause grief
-            if pkgconfig_msvc_flags == '':
+            for library_path in libpaths:
                 args.append('-L' + library_path)
                 if os.path.isabs(library_path):
-                    if libtool:
-                        args.append('-rpath')
-                        args.append(library_path)
-                    else:
-                        args.append('-Wl,-rpath=' + library_path)
+                    args.append('-rpath')
+                    args.append(library_path)
 
-    def get_external_link_flags(self, args, libraries, pkgconfig_msvc_flags):
+    def get_external_link_flags(self, args, libtool, libraries):
         # An "external" link is where the library to be introspected
         # is installed on the system; this case is used for the scanning
         # of GLib in gobject-introspection itself.
 
         for library in libraries:
-            # The --library option on Windows pass in the .dll file(s) the
-            # .gir files refer to, so don't link to them on Visual C++
-            if pkgconfig_msvc_flags == '':
+            if not libtool:
+                self.compiler.add_library(library)
+            else:
                 if library.endswith(".la"):  # explicitly specified libtool library
                     args.append(library)
                 else:
                     args.append('-l' + library)
 
+    def preprocess(self, source, output, cpp_options):
+        extra_postargs = ['-C']
+        (include_paths, macros, postargs) = self._set_cpp_options(cpp_options)
+
+        # We always want to include the current path
+        include_dirs = ['.']
+
+        include_dirs.extend(include_paths)
+        extra_postargs.extend(postargs)
+
+        # Define these macros when using Visual C++ to silence many warnings,
+        # and prevent stepping on many Visual Studio-specific items, so that
+        # we don't have to handle them specifically in scannerlexer.l
+        if self.check_is_msvc():
+            macros.append(('_USE_DECLSPECS_FOR_SAL', None))
+            macros.append(('_CRT_SECURE_NO_WARNINGS', None))
+            macros.append(('_CRT_NONSTDC_NO_WARNINGS', None))
+            macros.append(('SAL_NO_ATTRIBUTE_DECLARATIONS', None))
+
+        self.compiler.preprocess(source=source,
+                                 output_file=output,
+                                 macros=macros,
+                                 include_dirs=include_dirs,
+                                 extra_postargs=extra_postargs)
+
+    def compile(self, pkg_config_cflags, cpp_includes, source, init_sections):
+        extra_postargs = []
+        includes = []
+        source_str = ''.join(source)
+        tmpdir_idx = source_str.rfind(os.sep, 0, source_str.rfind(os.sep))
+        (include_paths, macros, extra_args) = \
+            self._set_cpp_options(pkg_config_cflags)
+
+        for include in cpp_includes:
+            includes.append(include)
+
+        if isinstance(self.compiler, UnixCCompiler):
+            # This is to handle the case where macros are defined in CFLAGS
+            cflags = os.environ.get('CFLAGS')
+            if cflags:
+                for i, cflag in enumerate(cflags.split()):
+                    if cflag.startswith('-D'):
+                        stridx = cflag.find('=')
+                        if stridx > -1:
+                            macroset = (cflag[2:stridx],
+                                        cflag[stridx + 1:])
+                        else:
+                            macroset = (cflag[2:], None)
+                        if macroset not in macros:
+                            macros.append(macroset)
+
+        # Do not add -Wall when using init code as we do not include any
+        # header of the library being introspected
+        if self.compiler_cmd == 'gcc' and not init_sections:
+            extra_postargs.append('-Wall')
+        extra_postargs.append(self._cflags_no_deprecation_warnings)
+
+        includes.extend(include_paths)
+        extra_postargs.extend(extra_args)
+
+        return self.compiler.compile(sources=source,
+                                     macros=macros,
+                                     include_dirs=includes,
+                                     extra_postargs=extra_postargs,
+                                     output_dir=source_str[tmpdir_idx + 1:
+                                                           source_str.rfind(os.sep)])
+
+    def link(self, output, objects, lib_args):
+        # Note: This is used for non-libtool builds only!
+        extra_preargs = []
+        extra_postargs = []
+        library_dirs = []
+        libraries = []
+
+        for arg in lib_args:
+            extra_postargs.append(arg)
+
+        self.compiler.link(target_desc=self.compiler.EXECUTABLE,
+                           objects=objects,
+                           output_filename=output,
+                           extra_preargs=extra_preargs,
+                           extra_postargs=extra_postargs)
+
     def resolve_windows_libs(self, libraries, options):
         args = []
-        compiler_cmd = os.environ.get('CC', 'cc')
         libsearch = []
 
         # When we are using Visual C++...
-        if 'cl.exe' in compiler_cmd or 'cl' in compiler_cmd:
+        if self.check_is_msvc():
             # The search path of the .lib's on Visual C++
             # is dependent on the LIB environmental variable,
             # so just query for that
-            is_msvc = True
             libpath = os.environ.get('LIB')
             libsearch = libpath.split(';')
 
@@ -128,7 +274,6 @@
 
         # When we are not using Visual C++ (i.e. we are using GCC)...
         else:
-            is_msvc = False
             libtool = utils.get_libtool_command(options)
             if libtool:
                 args.append(utils.which(os.environ.get('SHELL', 'sh.exe')))
@@ -136,7 +281,7 @@
                 args.append('--mode=execute')
             # FIXME: it could have prefix (i686-w64-mingw32-dlltool.exe)
             args.extend(['dlltool.exe', '--identify'])
-            proc = subprocess.Popen([compiler_cmd, '-print-search-dirs'],
+            proc = subprocess.Popen([self.compiler_cmd, '-print-search-dirs'],
                                     stdout=subprocess.PIPE)
             o, e = proc.communicate()
             for line in o.splitlines():
@@ -168,7 +313,7 @@
                                                 stdout=subprocess.PIPE)
                         o, e = proc.communicate()
                         for line in o.splitlines():
-                            if is_msvc:
+                            if self.check_is_msvc():
                                 # On Visual Studio, dumpbin -symbols something.lib gives the
                                 # filename of DLL without the '.dll' extension that something.lib
                                 # links to, in the line that contains
@@ -194,3 +339,38 @@
                 "ERROR: can't resolve libraries to shared libraries: " +
                 ", ".join(not_resolved))
         return shlibs
+
+    def check_is_msvc(self):
+        if isinstance(self.compiler, MSVCCompiler):
+            return True
+        else:
+            return False
+
+    # Private APIs
+    def _set_cpp_options(self, options):
+        includes = []
+        macros = []
+        other_options = []
+
+        for o in options:
+            option = utils.cflag_real_include_path(o)
+            if option.startswith('-I'):
+                includes.append(option[len('-I'):])
+            elif option.startswith('-D'):
+                macro = option[len('-D'):]
+                macro_index = macro.find('=')
+                if macro_index == -1:
+                    macro_name = macro
+                    macro_value = None
+                else:
+                    macro_name = macro[:macro_index]
+                    macro_value = macro[macro_index + 1:]
+                macros.append((macro_name, macro_value))
+            elif option.startswith('-U'):
+                macros.append((option[len('-U'):],))
+            else:
+                # We expect the preprocessor to remove macros. If debugging is turned
+                # up high enough that won't happen, so don't add those flags. Bug #720504
+                if option not in ['-g3', '-ggdb3', '-gstabs3', '-gcoff3', '-gxcoff3', '-gvms3']:
+                    other_options.append(option)
+        return (includes, macros, other_options)
diff -Nru gobject-introspection-1.45.3/giscanner/docmain.py gobject-introspection-1.46.0/giscanner/docmain.py
--- gobject-introspection-1.45.3/giscanner/docmain.py	2015-06-18 09:24:02.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/docmain.py	2015-08-21 12:03:01.000000000 +0000
@@ -60,9 +60,8 @@
     if args.write_sections:
         sections_file = generate_sections_file(transformer)
 
-        fp = open(args.output, 'w')
-        write_sections_file(fp, sections_file)
-        fp.close()
+        with open(args.output, 'w') as fp:
+            write_sections_file(fp, sections_file)
     else:
         writer = DocWriter(transformer, args.language)
         writer.write(args.output)
diff -Nru gobject-introspection-1.45.3/giscanner/docwriter.py gobject-introspection-1.46.0/giscanner/docwriter.py
--- gobject-introspection-1.45.3/giscanner/docwriter.py	2014-03-12 20:17:11.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/docwriter.py	2015-08-21 12:03:01.000000000 +0000
@@ -953,6 +953,5 @@
 
         output_file_name = os.path.join(os.path.abspath(output),
                                         page_id + '.page')
-        fp = open(output_file_name, 'w')
-        fp.write(result)
-        fp.close()
+        with open(output_file_name, 'w') as fp:
+            fp.write(result)
diff -Nru gobject-introspection-1.45.3/giscanner/dumper.py gobject-introspection-1.46.0/giscanner/dumper.py
--- gobject-introspection-1.45.3/giscanner/dumper.py	2014-08-26 09:29:24.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/dumper.py	2015-09-09 10:20:37.000000000 +0000
@@ -24,6 +24,7 @@
 import subprocess
 import shutil
 import tempfile
+from distutils.errors import LinkError
 
 from .gdumpparser import IntrospectionBinary
 from . import utils
@@ -78,25 +79,24 @@
 
 class DumpCompiler(object):
 
+    _compiler = None
+
     def __init__(self, options, get_type_functions, error_quark_functions):
         self._options = options
         self._get_type_functions = get_type_functions
         self._error_quark_functions = error_quark_functions
 
-        self._compiler_cmd = os.environ.get('CC', 'cc')
-        self._linker_cmd = os.environ.get('CC', self._compiler_cmd)
+        # Acquire the compiler (and linker) commands via the CCompiler class in ccompiler.py
+        self._compiler = CCompiler()
+
         self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
-        self._pkgconfig_msvc_flags = ''
-        # Enable the --msvc-syntax pkg-config flag when
-        # the Microsoft compiler is used
-        # (This is the other way to check whether Visual C++ is used subsequently)
-        args = self._compiler_cmd.split()
-        if 'cl.exe' in args or 'cl' in args:
-            self._pkgconfig_msvc_flags = '--msvc-syntax'
-        self._uninst_srcdir = os.environ.get(
-            'UNINSTALLED_INTROSPECTION_SRCDIR')
+        self._uninst_srcdir = os.environ.get('UNINSTALLED_INTROSPECTION_SRCDIR')
         self._packages = ['gio-2.0 gmodule-2.0']
         self._packages.extend(options.packages)
+        if hasattr(self._compiler.compiler, 'linker_exe'):
+            self._linker_cmd = self._compiler.compiler.linker_exe
+        else:
+            self._linker_cmd = []
 
     # Public API
 
@@ -114,68 +114,59 @@
                                       'gdump.c')
         if not os.path.isfile(gdump_path):
             raise SystemExit("Couldn't find %r" % (gdump_path, ))
-        gdump_file = open(gdump_path)
-        gdump_contents = gdump_file.read()
-        gdump_file.close()
+        with open(gdump_path) as gdump_file:
+            gdump_contents = gdump_file.read()
         tpl_args['gdump_include'] = gdump_contents
         tpl_args['init_sections'] = "\n".join(self._options.init_sections)
 
         c_path = self._generate_tempfile(tmpdir, '.c')
-        f = open(c_path, 'w')
-        f.write(_PROGRAM_TEMPLATE % tpl_args)
+        with open(c_path, 'w') as f:
+            f.write(_PROGRAM_TEMPLATE % tpl_args)
 
-        # We need to reference our get_type and error_quark functions
-        # to make sure they are pulled in at the linking stage if the
-        # library is a static library rather than a shared library.
-        if len(self._get_type_functions) > 0:
-            for func in self._get_type_functions:
-                f.write("extern GType " + func + "(void);\n")
-            f.write("GType (*GI_GET_TYPE_FUNCS_[])(void) = {\n")
-            first = True
-            for func in self._get_type_functions:
-                if first:
-                    first = False
-                else:
-                    f.write(",\n")
-                f.write("  " + func)
-            f.write("\n};\n")
-        if len(self._error_quark_functions) > 0:
-            for func in self._error_quark_functions:
-                f.write("extern GQuark " + func + "(void);\n")
-            f.write("GQuark (*GI_ERROR_QUARK_FUNCS_[])(void) = {\n")
-            first = True
-            for func in self._error_quark_functions:
-                if first:
-                    first = False
-                else:
-                    f.write(",\n")
-                f.write("  " + func)
-            f.write("\n};\n")
-        f.close()
-
-        # Microsoft compilers generate intermediate .obj files
-        # during compilation, unlike .o files like GCC and others
-        if self._pkgconfig_msvc_flags:
-            o_path = self._generate_tempfile(tmpdir, '.obj')
-        else:
-            o_path = self._generate_tempfile(tmpdir, '.o')
+            # We need to reference our get_type and error_quark functions
+            # to make sure they are pulled in at the linking stage if the
+            # library is a static library rather than a shared library.
+            if len(self._get_type_functions) > 0:
+                for func in self._get_type_functions:
+                    f.write("extern GType " + func + "(void);\n")
+                f.write("GType (*GI_GET_TYPE_FUNCS_[])(void) = {\n")
+                first = True
+                for func in self._get_type_functions:
+                    if first:
+                        first = False
+                    else:
+                        f.write(",\n")
+                    f.write("  " + func)
+                f.write("\n};\n")
+            if len(self._error_quark_functions) > 0:
+                for func in self._error_quark_functions:
+                    f.write("extern GQuark " + func + "(void);\n")
+                f.write("GQuark (*GI_ERROR_QUARK_FUNCS_[])(void) = {\n")
+                first = True
+                for func in self._error_quark_functions:
+                    if first:
+                        first = False
+                    else:
+                        f.write(",\n")
+                    f.write("  " + func)
+                f.write("\n};\n")
 
-        if os.name == 'nt':
-            ext = '.exe'
+        if self._compiler.compiler.exe_extension:
+            ext = self._compiler.compiler.exe_extension
         else:
             ext = ''
 
         bin_path = self._generate_tempfile(tmpdir, ext)
 
         try:
-            self._compile(o_path, c_path)
+            introspection_obj = self._compile(c_path)
         except CompilerError as e:
             if not utils.have_debug_flag('save-temps'):
                 shutil.rmtree(tmpdir)
             raise SystemExit('compilation of temporary binary failed:' + str(e))
 
         try:
-            self._link(bin_path, o_path)
+            self._link(bin_path, introspection_obj)
         except LinkerError as e:
             if not utils.have_debug_flag('save-temps'):
                 shutil.rmtree(tmpdir)
@@ -193,8 +184,8 @@
     def _run_pkgconfig(self, flag):
         # Enable the --msvc-syntax pkg-config flag when
         # the Microsoft compiler is used
-        if self._pkgconfig_msvc_flags:
-            cmd = [self._pkgconfig_cmd, self._pkgconfig_msvc_flags, flag]
+        if self._compiler.check_is_msvc():
+            cmd = [self._pkgconfig_cmd, '--msvc-syntax', flag]
         else:
             cmd = [self._pkgconfig_cmd, flag]
         proc = subprocess.Popen(
@@ -202,134 +193,126 @@
             stdout=subprocess.PIPE)
         return proc.communicate()[0].split()
 
-    def _compile(self, output, *sources):
-        # Not strictly speaking correct, but easier than parsing shell
-        args = self._compiler_cmd.split()
-        # Do not add -Wall when using init code as we do not include any
-        # header of the library being introspected
-        if self._compiler_cmd == 'gcc' and not self._options.init_sections:
-            args.append('-Wall')
-        # The Microsoft compiler uses different option flags for
-        # silencing warnings on deprecated function usage
-        if self._pkgconfig_msvc_flags:
-            args.append("-wd4996")
-        else:
-            args.append("-Wno-deprecated-declarations")
+    def _compile(self, *sources):
         pkgconfig_flags = self._run_pkgconfig('--cflags')
-        args.extend([utils.cflag_real_include_path(f) for f in pkgconfig_flags])
-        cppflags = os.environ.get('CPPFLAGS', '')
-        for cppflag in cppflags.split():
-            args.append(cppflag)
-        cflags = os.environ.get('CFLAGS', '')
-        for cflag in cflags.split():
-            args.append(cflag)
-        for include in self._options.cpp_includes:
-            args.append('-I' + include)
-        # The Microsoft compiler uses different option flags for
-        # compilation result output
-        if self._pkgconfig_msvc_flags:
-            args.extend(['-c', '-Fe' + output, '-Fo' + output])
-        else:
-            args.extend(['-c', '-o', output])
-        for source in sources:
-            if not os.path.exists(source):
-                raise CompilerError(
-                    "Could not find c source file: %s" % (source, ))
-        args.extend(list(sources))
-        if not self._options.quiet:
-            print "g-ir-scanner: compile: %s" % (
-                subprocess.list2cmdline(args), )
-            sys.stdout.flush()
-        try:
-            subprocess.check_call(args)
-        except subprocess.CalledProcessError as e:
-            raise CompilerError(e)
+        return self._compiler.compile(pkgconfig_flags,
+                                      self._options.cpp_includes,
+                                      sources,
+                                      self._options.init_sections)
 
-    def _link(self, output, *sources):
+    def _link(self, output, sources):
         args = []
         libtool = utils.get_libtool_command(self._options)
         if libtool:
+            # Note: MSVC Builds do not use libtool!
+            # In the libtool case, put together the linker command, as we did before.
+            # We aren't using distutils to link in this case.
             args.extend(libtool)
             args.append('--mode=link')
             args.append('--tag=CC')
             if self._options.quiet:
                 args.append('--silent')
 
-        args.extend(self._linker_cmd.split())
-        # We can use -o for the Microsoft compiler/linker,
-        # but it is considered deprecated usage with that
-        if self._pkgconfig_msvc_flags:
-            args.extend(['-Fe' + output])
-        else:
+            args.extend(self._linker_cmd)
+
             args.extend(['-o', output])
-        if libtool:
             if os.name == 'nt':
                 args.append('-Wl,--export-all-symbols')
             else:
                 args.append('-export-dynamic')
 
-        cppflags = os.environ.get('CPPFLAGS', '')
-        for cppflag in cppflags.split():
-            args.append(cppflag)
-        cflags = os.environ.get('CFLAGS', '')
-        for cflag in cflags.split():
-            args.append(cflag)
-        ldflags = os.environ.get('LDFLAGS', '')
-        for ldflag in ldflags.split():
-            args.append(ldflag)
+        if not self._compiler.check_is_msvc():
+            # These envvars are not used for MSVC Builds!
+            # MSVC Builds use the INCLUDE, LIB envvars,
+            # which are automatically picked up during
+            # compilation and linking
+            cppflags = os.environ.get('CPPFLAGS', '')
+            for cppflag in cppflags.split():
+                args.append(cppflag)
+            cflags = os.environ.get('CFLAGS', '')
+            for cflag in cflags.split():
+                args.append(cflag)
+            ldflags = os.environ.get('LDFLAGS', '')
+            for ldflag in ldflags.split():
+                args.append(ldflag)
 
         # Make sure to list the library to be introspected first since it's
         # likely to be uninstalled yet and we want the uninstalled RPATHs have
         # priority (or we might run with installed library that is older)
-
         for source in sources:
             if not os.path.exists(source):
                 raise CompilerError(
                     "Could not find object file: %s" % (source, ))
-        args.extend(list(sources))
 
-        cc = CCompiler()
+        if libtool:
+            args.extend(sources)
+
+        pkg_config_libs = self._run_pkgconfig('--libs')
 
         if not self._options.external_library:
-            cc.get_internal_link_flags(args,
-                                       libtool,
-                                       self._options.libraries,
-                                       self._options.library_paths,
-                                       self._pkgconfig_msvc_flags,
-                                       self._options.namespace_name,
-                                       self._options.namespace_version)
-            args.extend(self._run_pkgconfig('--libs'))
+            self._compiler.get_internal_link_flags(args,
+                                                   libtool,
+                                                   self._options.libraries,
+                                                   self._options.library_paths)
+            args.extend(pkg_config_libs)
 
         else:
-            args.extend(self._run_pkgconfig('--libs'))
-            cc.get_external_link_flags(args,
-                                       self._options.libraries,
-                                       self._pkgconfig_msvc_flags)
-
-        if not self._options.quiet:
-            print "g-ir-scanner: link: %s" % (
-                subprocess.list2cmdline(args), )
-            sys.stdout.flush()
-        msys = os.environ.get('MSYSTEM', None)
-        if msys:
-            shell = os.environ.get('SHELL', 'sh.exe')
-            # Create a temporary script file that
-            # runs the command we want
-            tf, tf_name = tempfile.mkstemp()
-            f = os.fdopen(tf, 'wb')
-            shellcontents = ' '.join([x.replace('\\', '/') for x in args])
-            fcontents = '#!/bin/sh\nunset PWD\n{}\n'.format(shellcontents)
-            f.write(fcontents)
-            f.close()
-            shell = utils.which(shell)
-            args = [shell, tf_name.replace('\\', '/')]
-        try:
-            subprocess.check_call(args)
-        except subprocess.CalledProcessError as e:
-            raise LinkerError(e)
-        finally:
+            args.extend(pkg_config_libs)
+            self._compiler.get_external_link_flags(args,
+                                                   libtool,
+                                                   self._options.libraries)
+
+        if not libtool:
+            # non-libtool: prepare distutils for linking the introspection
+            # dumper program...
+            try:
+                self._compiler.link(output,
+                                    sources,
+                                    args)
+
+            # Ignore failing to embed the manifest files, when the manifest
+            # file does not exist, especially for MSVC 2010 and later builds.
+            # If we are on Visual C++ 2005/2008, where
+            # this embedding is required, the build will fail anyway, as
+            # the dumper program will likely fail to run, and this means
+            # something went wrong with the build.
+            except LinkError, e:
+                if self._compiler.check_is_msvc():
+                    msg = str(e)
+
+                    if msg[msg.rfind('mt.exe'):] == 'mt.exe\' failed with exit status 31':
+                        sys.exc_clear()
+                        pass
+                    else:
+                        raise LinkError(e)
+                else:
+                    raise LinkError(e)
+        else:
+            # libtool: Run the assembled link command, we don't use distutils
+            # for linking here.
+            if not self._options.quiet:
+                print "g-ir-scanner: link: %s" % (
+                    subprocess.list2cmdline(args), )
+                sys.stdout.flush()
+            msys = os.environ.get('MSYSTEM', None)
             if msys:
-                os.remove(tf_name)
+                shell = os.environ.get('SHELL', 'sh.exe')
+                # Create a temporary script file that
+                # runs the command we want
+                tf, tf_name = tempfile.mkstemp()
+                with os.fdopen(tf, 'wb') as f:
+                    shellcontents = ' '.join([x.replace('\\', '/') for x in args])
+                    fcontents = '#!/bin/sh\nunset PWD\n{}\n'.format(shellcontents)
+                    f.write(fcontents)
+                shell = utils.which(shell)
+                args = [shell, tf_name.replace('\\', '/')]
+            try:
+                subprocess.check_call(args)
+            except subprocess.CalledProcessError as e:
+                raise LinkerError(e)
+            finally:
+                if msys:
+                    os.remove(tf_name)
 
 
 def compile_introspection_binary(options, get_type_functions,
diff -Nru gobject-introspection-1.45.3/giscanner/gdumpparser.py gobject-introspection-1.46.0/giscanner/gdumpparser.py
--- gobject-introspection-1.45.3/giscanner/gdumpparser.py	2015-07-03 11:46:48.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/gdumpparser.py	2015-08-21 12:03:01.000000000 +0000
@@ -145,16 +145,15 @@
         """Load the library (or executable), returning an XML
 blob containing data gleaned from GObject's primitive introspection."""
         in_path = os.path.join(self._binary.tmpdir, 'functions.txt')
-        f = open(in_path, 'w')
-        for func in self._get_type_functions:
-            f.write('get-type:')
-            f.write(func)
-            f.write('\n')
-        for func in self._error_quark_functions:
-            f.write('error-quark:')
-            f.write(func)
-            f.write('\n')
-        f.close()
+        with open(in_path, 'w') as f:
+            for func in self._get_type_functions:
+                f.write('get-type:')
+                f.write(func)
+                f.write('\n')
+            for func in self._error_quark_functions:
+                f.write('error-quark:')
+                f.write(func)
+                f.write('\n')
         out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
 
         args = []
diff -Nru gobject-introspection-1.45.3/giscanner/msvccompiler.py gobject-introspection-1.46.0/giscanner/msvccompiler.py
--- gobject-introspection-1.45.3/giscanner/msvccompiler.py	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/msvccompiler.py	2015-07-30 10:32:27.000000000 +0000
@@ -0,0 +1,101 @@
+# -*- Mode: Python -*-
+# GObject-Introspection - a framework for introspecting GObject libraries
+# Copyright (C) 2014  Chun-wei Fan
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+import os
+import distutils
+
+from distutils.errors import (DistutilsExecError, CompileError, LibError,
+                              LinkError, UnknownFileError)
+from distutils.ccompiler import CCompiler, gen_preprocess_options
+from distutils.dep_util import newer
+
+# Distutil's MSVCCompiler does not provide a preprocess()
+# Implementation, so do our own here.
+
+
+def get_msvc_compiler():
+    return MSVCCompiler()
+
+
+class MSVCCompiler(distutils.msvccompiler.MSVCCompiler):
+
+    def __init__(self, verbose=0, dry_run=0, force=0):
+        CCompiler.__init__(self, verbose, dry_run, force)
+        self.__paths = []
+        self.__arch = None  # deprecated name
+        if os.name == 'nt':
+            if isinstance(self, distutils.msvc9compiler.MSVCCompiler):
+                self.__version = distutils.msvc9compiler.VERSION
+        self.initialized = False
+        self.preprocess_options = None
+
+    def preprocess(self,
+                   source,
+                   output_file=None,
+                   macros=None,
+                   include_dirs=None,
+                   extra_preargs=None,
+                   extra_postargs=None):
+        if self.initialized is False:
+            self.initialize()
+
+        (_, macros, include_dirs) = \
+            self._fix_compile_args(None, macros, include_dirs)
+        pp_opts = gen_preprocess_options(macros, include_dirs)
+        preprocess_options = ['-E']
+        source_basename = None
+
+        if output_file is not None:
+            preprocess_options.append('-P')
+            source_basename = self._get_file_basename(source)
+        cpp_args = self.cc.split()
+        if extra_preargs is not None:
+            cpp_args[:0] = extra_preargs
+        if extra_postargs is not None:
+            preprocess_options.extend(extra_postargs)
+        cpp_args.extend(preprocess_options)
+        cpp_args.extend(pp_opts)
+        cpp_args.append(source)
+
+        # We need to preprocess: either we're being forced to, or the
+        # source file is newer than the target (or the target doesn't
+        # exist).
+        if self.force or output_file is None or newer(source, output_file):
+            try:
+                self.spawn(cpp_args)
+            except DistutilsExecError, msg:
+                print msg
+                raise CompileError
+
+        # The /P option for the MSVC preprocessor will output the results
+        # of the preprocessor to a file, as <source_without_extension>.i,
+        # so in order to output the specified filename, we need to rename
+        # that file
+        if output_file is not None:
+            if output_file != source_basename + '.i':
+                os.rename(source_basename + '.i', output_file)
+
+    def _get_file_basename(self, filename):
+        if filename is None:
+            return None
+        if filename.rfind('.') == -1:
+            return filename[filename.rfind('\\') + 1:]
+        else:
+            return filename[filename.rfind('\\') + 1:filename.rfind('.')]
diff -Nru gobject-introspection-1.45.3/giscanner/scannerlexer.l gobject-introspection-1.46.0/giscanner/scannerlexer.l
--- gobject-introspection-1.45.3/giscanner/scannerlexer.l	2015-03-24 00:50:04.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/scannerlexer.l	2015-07-30 10:32:27.000000000 +0000
@@ -165,6 +165,7 @@
 "__inline"				{ return INLINE; }
 "__nonnull" 			        { if (!parse_ignored_macro()) REJECT; }
 "_Noreturn" 			        { /* Ignore */ }
+"__signed"                              { return SIGNED; }
 "__signed__"				{ return SIGNED; }
 "__restrict"				{ return RESTRICT; }
 "__restrict__"				{ return RESTRICT; }
diff -Nru gobject-introspection-1.45.3/giscanner/scannermain.py gobject-introspection-1.46.0/giscanner/scannermain.py
--- gobject-introspection-1.45.3/giscanner/scannermain.py	2015-07-03 11:46:48.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/scannermain.py	2015-09-09 10:14:35.000000000 +0000
@@ -322,8 +322,8 @@
     filenames = []
     if not os.path.exists(options.filelist):
         _error('%s: no such filelist file' % (options.filelist, ))
-    filelist_file = open(options.filelist, "r")
-    lines = filelist_file.readlines()
+    with open(options.filelist, "r") as filelist_file:
+        lines = filelist_file.readlines()
     for line in lines:
         # We don't support real C++ parsing yet, but we should be able
         # to understand C API implemented in C++ files.
@@ -443,14 +443,12 @@
         output = sys.stdout
     elif options.reparse_validate_gir:
         main_f, main_f_name = tempfile.mkstemp(suffix='.gir')
-        main_f = os.fdopen(main_f, 'w')
-        main_f.write(data)
-        main_f.close()
+        with os.fdopen(main_f, 'w') as main_f:
+            main_f.write(data)
 
         temp_f, temp_f_name = tempfile.mkstemp(suffix='.gir')
-        temp_f = os.fdopen(temp_f, 'w')
-        passthrough_gir(main_f_name, temp_f)
-        temp_f.close()
+        with os.fdopen(temp_f, 'w') as temp_f:
+            passthrough_gir(main_f_name, temp_f)
         if not utils.files_are_identical(main_f_name, temp_f_name):
             _error("Failed to re-parse gir file; scanned=%r passthrough=%r" % (
                 main_f_name, temp_f_name))
diff -Nru gobject-introspection-1.45.3/giscanner/sourcescanner.py gobject-introspection-1.46.0/giscanner/sourcescanner.py
--- gobject-introspection-1.45.3/giscanner/sourcescanner.py	2015-07-03 11:46:48.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/sourcescanner.py	2015-07-30 10:32:27.000000000 +0000
@@ -25,6 +25,7 @@
 
 from .libtoolimporter import LibtoolImporter
 from .message import Position
+from .ccompiler import CCompiler
 
 with LibtoolImporter(None, None):
     if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
@@ -281,57 +282,38 @@
 
         defines = ['__GI_SCANNER__']
         undefs = []
-        cpp_args = os.environ.get('CC', 'cc').split()  # support CC="ccache gcc"
-        if 'cl' in cpp_args:
-            # The Microsoft compiler/preprocessor (cl) does not accept
-            # source input from stdin (the '-' flag), so we need
-            # some help from gcc from MinGW/Cygwin or so.
-            # Note that the generated dumper program is
-            # still built and linked by Visual C++.
-            cpp_args = ['gcc']
-        cpp_args += os.environ.get('CPPFLAGS', '').split()
-        cpp_args += os.environ.get('CFLAGS', '').split()
-        cpp_args += ['-E', '-C', '-I.', '-']
-        cpp_args += self._cpp_options
-
-        # We expect the preprocessor to remove macros. If debugging is turned
-        # up high enough that won't happen, so strip these out. Bug #720504
-        for flag in ['-g3', '-ggdb3', '-gstabs3', '-gcoff3', '-gxcoff3', '-gvms3']:
-            try:
-                cpp_args.remove(flag)
-            except ValueError:
-                pass
-
-        proc = subprocess.Popen(cpp_args,
-                                stdin=subprocess.PIPE,
-                                stdout=subprocess.PIPE)
 
-        for define in defines:
-            proc.stdin.write('#ifndef %s\n' % (define, ))
-            proc.stdin.write('# define %s\n' % (define, ))
-            proc.stdin.write('#endif\n')
-        for undef in undefs:
-            proc.stdin.write('#undef %s\n' % (undef, ))
-        for filename in filenames:
-            proc.stdin.write('#include <%s>\n' % (filename, ))
-        proc.stdin.close()
+        cc = CCompiler()
+
+        tmp_fd_cpp, tmp_name_cpp = tempfile.mkstemp(prefix='g-ir-cpp-', suffix='.c')
+        fp_cpp = os.fdopen(tmp_fd_cpp, 'w')
+        self._write_preprocess_src(fp_cpp, defines, undefs, filenames)
+        fp_cpp.close()
+
+        tmpfile_basename = os.path.basename(os.path.splitext(tmp_name_cpp)[0])
+
+        # Output file name of the preprocessor, only really used on non-MSVC,
+        # so we want the name to match the output file name of the MSVC preprocessor
+        tmpfile_output = tmpfile_basename + '.i'
 
-        tmp_fd, tmp_name = tempfile.mkstemp()
-        fp = os.fdopen(tmp_fd, 'w+b')
-        while True:
-            data = proc.stdout.read(4096)
-            if data is None:
-                break
-            fp.write(data)
-            if len(data) < 4096:
-                break
-        fp.seek(0, 0)
-
-        assert proc, 'Proc was none'
-        proc.wait()
-        if proc.returncode != 0:
-            raise SystemExit('Error while processing the source.')
+        cc.preprocess(tmp_name_cpp,
+                      tmpfile_output,
+                      self._cpp_options)
+
+        os.unlink(tmp_name_cpp)
+        fp = open(tmpfile_output, 'r')
 
         self._scanner.parse_file(fp.fileno())
         fp.close()
-        os.unlink(tmp_name)
+        os.unlink(tmpfile_output)
+
+    def _write_preprocess_src(self, fp, defines, undefs, filenames):
+        # Write to the temp file for feeding into the preprocessor
+        for define in defines:
+            fp.write('#ifndef %s\n' % (define, ))
+            fp.write('# define %s\n' % (define, ))
+            fp.write('#endif\n')
+        for undef in undefs:
+            fp.write('#undef %s\n' % (undef, ))
+        for filename in filenames:
+            fp.write('#include <%s>\n' % (filename, ))
diff -Nru gobject-introspection-1.45.3/giscanner/utils.py gobject-introspection-1.46.0/giscanner/utils.py
--- gobject-introspection-1.45.3/giscanner/utils.py	2015-06-22 17:07:46.000000000 +0000
+++ gobject-introspection-1.46.0/giscanner/utils.py	2015-08-21 12:03:01.000000000 +0000
@@ -80,9 +80,8 @@
 
 
 def _extract_dlname_field(la_file):
-    f = open(la_file)
-    data = f.read()
-    f.close()
+    with open(la_file) as f:
+        data = f.read()
     m = _libtool_pat.search(data)
     if m:
         return m.groups()[0]
@@ -94,9 +93,8 @@
 
 
 def _extract_libdir_field(la_file):
-    f = open(la_file)
-    data = f.read()
-    f.close()
+    with open(la_file) as f:
+        data = f.read()
     m = _libtool_libdir_pat.search(data)
     if m:
         return m.groups()[0]
@@ -166,16 +164,13 @@
 
 
 def files_are_identical(path1, path2):
-    f1 = open(path1)
-    f2 = open(path2)
-    buf1 = f1.read(8192)
-    buf2 = f2.read(8192)
-    while buf1 == buf2 and buf1 != '':
+    with open(path1) as f1, open(path2) as f2:
         buf1 = f1.read(8192)
         buf2 = f2.read(8192)
-    f1.close()
-    f2.close()
-    return buf1 == buf2
+        while buf1 == buf2 and buf1 != '':
+            buf1 = f1.read(8192)
+            buf2 = f2.read(8192)
+        return buf1 == buf2
 
 
 def cflag_real_include_path(cflag):
diff -Nru gobject-introspection-1.45.3/gobject-introspection-1.0.pc gobject-introspection-1.46.0/gobject-introspection-1.0.pc
--- gobject-introspection-1.45.3/gobject-introspection-1.0.pc	2015-07-03 20:30:38.000000000 +0000
+++ gobject-introspection-1.46.0/gobject-introspection-1.0.pc	2015-09-22 11:24:42.000000000 +0000
@@ -1,4 +1,4 @@
-prefix=/home/fmuellner/opt/gnome
+prefix=/home/ebassi/gnome/install
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
@@ -21,4 +21,4 @@
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.45.3
+Version: 1.46.0
diff -Nru gobject-introspection-1.45.3/gobject-introspection-no-export-1.0.pc gobject-introspection-1.46.0/gobject-introspection-no-export-1.0.pc
--- gobject-introspection-1.45.3/gobject-introspection-no-export-1.0.pc	2015-07-03 20:30:38.000000000 +0000
+++ gobject-introspection-1.46.0/gobject-introspection-no-export-1.0.pc	2015-09-22 11:24:42.000000000 +0000
@@ -1,4 +1,4 @@
-prefix=/home/fmuellner/opt/gnome
+prefix=/home/ebassi/gnome/install
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 bindir=${exec_prefix}/bin
@@ -20,4 +20,4 @@
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.45.3
+Version: 1.46.0
diff -Nru gobject-introspection-1.45.3/gtk-doc.make gobject-introspection-1.46.0/gtk-doc.make
--- gobject-introspection-1.45.3/gtk-doc.make	2015-07-03 11:38:49.000000000 +0000
+++ gobject-introspection-1.46.0/gtk-doc.make	2015-09-21 23:52:39.000000000 +0000
@@ -142,7 +142,7 @@
 GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY))
 GTK_DOC_V_XML_0=@echo "  DOC   Building XML";
 
-sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files)
+sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent
 	$(GTK_DOC_V_XML)_source_dir='' ; \
 	for i in $(DOC_SOURCE_DIR) ; do \
 	    _source_dir="$${_source_dir} --source-dir=$$i" ; \
@@ -153,6 +153,17 @@
 sgml.stamp: sgml-build.stamp
 	@true
 
+xml/gtkdocentities.ent: Makefile
+	$(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \
+		echo "<!ENTITY package \"$(PACKAGE)\">"; \
+		echo "<!ENTITY package_bugreport \"$(PACKAGE_BUGREPORT)\">"; \
+		echo "<!ENTITY package_name \"$(PACKAGE_NAME)\">"; \
+		echo "<!ENTITY package_string \"$(PACKAGE_STRING)\">"; \
+		echo "<!ENTITY package_tarname \"$(PACKAGE_TARNAME)\">"; \
+		echo "<!ENTITY package_url \"$(PACKAGE_URL)\">"; \
+		echo "<!ENTITY package_version \"$(PACKAGE_VERSION)\">"; \
+	) > $@
+
 #### html ####
 
 GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V))
diff -Nru gobject-introspection-1.45.3/Makefile-giscanner.am gobject-introspection-1.46.0/Makefile-giscanner.am
--- gobject-introspection-1.45.3/Makefile-giscanner.am	2014-08-26 09:29:24.000000000 +0000
+++ gobject-introspection-1.46.0/Makefile-giscanner.am	2015-07-30 10:32:27.000000000 +0000
@@ -43,6 +43,7 @@
 	giscanner/libtoolimporter.py	\
 	giscanner/maintransformer.py	\
 	giscanner/message.py		\
+	giscanner/msvccompiler.py	\
 	giscanner/shlibs.py		\
 	giscanner/scannermain.py	\
 	giscanner/sectionparser.py	\
diff -Nru gobject-introspection-1.45.3/Makefile.in gobject-introspection-1.46.0/Makefile.in
--- gobject-introspection-1.45.3/Makefile.in	2015-07-03 20:30:32.000000000 +0000
+++ gobject-introspection-1.46.0/Makefile.in	2015-09-22 11:24:38.000000000 +0000
@@ -1194,6 +1194,7 @@
 	giscanner/libtoolimporter.py	\
 	giscanner/maintransformer.py	\
 	giscanner/message.py		\
+	giscanner/msvccompiler.py	\
 	giscanner/shlibs.py		\
 	giscanner/scannermain.py	\
 	giscanner/sectionparser.py	\
diff -Nru gobject-introspection-1.45.3/scannerlexer.c gobject-introspection-1.46.0/scannerlexer.c
--- gobject-introspection-1.45.3/scannerlexer.c	2015-03-24 00:50:26.000000000 +0000
+++ gobject-introspection-1.46.0/scannerlexer.c	2015-09-22 11:24:47.000000000 +0000
@@ -360,8 +360,8 @@
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 156
-#define YY_END_OF_BUFFER 157
+#define YY_NUM_RULES 157
+#define YY_END_OF_BUFFER 158
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -369,115 +369,115 @@
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int16_t yy_acclist[978] =
+static yyconst flex_int16_t yy_acclist[979] =
     {   0,
-      157,  155,  156,    3,  155,  156,    1,  156,   45,  155,
-      156,  155,  156,   20,  155,  156,   40,  155,  156,   42,
-      155,  156,  155,  156,   29,  155,  156,   30,  155,  156,
-       38,  155,  156,   36,  155,  156,   69,  155,  156,   37,
-      155,  156,   35,  155,  156,   39,  155,  156,  148,  155,
-      156,  148,  155,  156,   32,  155,  156,   31,  155,  156,
-       47,  155,  156,   46,  155,  156,   48,  155,  156,   34,
-      155,  156,  104,  145,  155,  156,  104,  145,  155,  156,
-      104,  145,  155,  156,  104,  145,  155,  156,  104,  145,
-      155,  156,   25,  155,  156,  155,  156,   27,  155,  156,
-
-       41,  155,  156,  104,  145,  155,  156,  104,  145,  155,
-      156,  104,  145,  155,  156,  104,  145,  155,  156,  104,
-      145,  155,  156,  104,  145,  155,  156,  104,  145,  155,
-      156,  104,  145,  155,  156,  104,  145,  155,  156,  104,
-      145,  155,  156,  104,  145,  155,  156,  104,  145,  155,
-      156,  104,  145,  155,  156,  104,  145,  155,  156,  104,
-      145,  155,  156,  104,  145,  155,  156,   21,  155,  156,
-       43,  155,  156,   23,  155,  156,   44,  155,  156,    3,
-        1,   62,  153,   53,   24,   65,   55,  151,   51,   67,
-       49,   68,   50,   70,  149,    4,    6,   52,  149,  147,
-
-      148,  148,  148,  148,   28,   22,   26,   57,   63,   61,
-       64,   58,  104,  145,  104,  145,  104,  145,  104,  145,
-        2,   54,  104,  145,  104,  145,  104,  145,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,  104,  145,
-      104,  145,  104,  145,  104,  114,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  122,  145,  104,  145,  104,  145,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,   56,   66,
-       33,  149,    6,  147,  148,  147,  148,  150,  148,  148,
-
-      148,  146,   59,   60,  104,  145,  104,  145,  154,  152,
-      104,  145,  104,  145,  104,  145,  104,  145,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,  104,  145,
-      104,  105,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      120,  145,  104,  145,  104,  145,  104,  124,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  149,  147,  148,  147,  148,  147,  148,
-      150,  148,  146,  146,  104,  145,  104,  145,  104,  145,
-      100,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  106,  145,
-      104,  107,  145,  104,  145,  104,  109,  145,  104,  110,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      116,  145,  104,  117,  145,  104,  145,  104,  145,  104,
-
-      145,  104,  121,  145,  104,  145,  104,  129,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  102,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  142,  145,  104,
-      145,  104,  145,   18,   13,  147,  148,  146,  146,  146,
-      101,  104,  145,  104,  145,  104,  145,   90,  104,  145,
-      104,  145,   74,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,   96,  104,  145,  104,  108,  145,  104,
-
-      111,  145,  104,  145,  104,  145,  104,  145,  104,  145,
-      103,  104,  145,  104,  119,  145,  104,  145,  104,  145,
-      104,  145,  104,  145,  104,  133,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      140,  145,  104,  145,  104,  145,  104,  144,  145,   15,
-      146,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  115,  145,  104,  118,  145,  104,
-
-      123,  145,  104,  145,  104,  145,  104,  132,  145,  104,
-      134,  145,  104,  135,  145,  104,  136,  145,  104,  137,
-      145,  104,  138,  145,  104,  145,  104,  145,  104,  145,
-       14,   16,    5,  104,  145,  104,  145,  104,  145,   75,
-      104,  145,  104,  145,   92,  104,  145,   78,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,   97,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  113,  145,
-      104,  145,  104,  145,  104,  139,  145,  104,  145,  104,
-      145,   12,  104,  145,  104,  145,  104,  145,  104,  145,
-
-      104,  145,  104,  145,   81,  104,  145,  104,  128,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,   87,  104,
-      145,  104,  145,  104,  145,  104,  112,  145,  104,  130,
-      145,  104,  131,  145,  104,  141,  145,  104,  143,  145,
-        8,   11,   19,   17,  104,  145,  104,  145,   83,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,  104,
-      145,   82,  104,  145,  104,  145,  104,  145,   95,  104,
-      145,  104,  127,  145,  104,  145,    7,    8,  104,  145,
-      104,  145,  104,  145,  104,  145,  104,  145,   80,  104,
-      145,  104,  126,  145,   85,  104,  145,   84,  104,  145,
-
-      104,  145,   88,  104,  145,  104,  145,  104,  145,   77,
-      104,  145,  104,  145,  104,  145,  104,  125,  145,  104,
-      145,  104,  145,  104,  145,  104,  145,  104,  145,   86,
-      104,  145,   89,  104,  145,  104,  145,  104,  145,   76,
-      104,  145,   94,   79,  104,  145,  104,  145,  104,  145,
-       71,  104,  145,  104,  145,  104,  145,  104,  145,   72,
-       98,  104,  145,  104,  145,   99,  104,  145,   73,    9,
-        9,   12,   10,   10,   11,   93,   91
+      158,  156,  157,    3,  156,  157,    1,  157,   45,  156,
+      157,  156,  157,   20,  156,  157,   40,  156,  157,   42,
+      156,  157,  156,  157,   29,  156,  157,   30,  156,  157,
+       38,  156,  157,   36,  156,  157,   69,  156,  157,   37,
+      156,  157,   35,  156,  157,   39,  156,  157,  149,  156,
+      157,  149,  156,  157,   32,  156,  157,   31,  156,  157,
+       47,  156,  157,   46,  156,  157,   48,  156,  157,   34,
+      156,  157,  105,  146,  156,  157,  105,  146,  156,  157,
+      105,  146,  156,  157,  105,  146,  156,  157,  105,  146,
+      156,  157,   25,  156,  157,  156,  157,   27,  156,  157,
+
+       41,  156,  157,  105,  146,  156,  157,  105,  146,  156,
+      157,  105,  146,  156,  157,  105,  146,  156,  157,  105,
+      146,  156,  157,  105,  146,  156,  157,  105,  146,  156,
+      157,  105,  146,  156,  157,  105,  146,  156,  157,  105,
+      146,  156,  157,  105,  146,  156,  157,  105,  146,  156,
+      157,  105,  146,  156,  157,  105,  146,  156,  157,  105,
+      146,  156,  157,  105,  146,  156,  157,   21,  156,  157,
+       43,  156,  157,   23,  156,  157,   44,  156,  157,    3,
+        1,   62,  154,   53,   24,   65,   55,  152,   51,   67,
+       49,   68,   50,   70,  150,    4,    6,   52,  150,  148,
+
+      149,  149,  149,  149,   28,   22,   26,   57,   63,   61,
+       64,   58,  105,  146,  105,  146,  105,  146,  105,  146,
+        2,   54,  105,  146,  105,  146,  105,  146,  105,  146,
+      105,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+      105,  146,  105,  146,  105,  115,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  123,  146,  105,  146,  105,  146,  105,  146,
+      105,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+      105,  146,  105,  146,  105,  146,  105,  146,   56,   66,
+       33,  150,    6,  148,  149,  148,  149,  151,  149,  149,
+
+      149,  147,   59,   60,  105,  146,  105,  146,  155,  153,
+      105,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+      105,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+      105,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+      105,  106,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      121,  146,  105,  146,  105,  146,  105,  125,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  150,  148,  149,  148,  149,  148,  149,
+      151,  149,  147,  147,  105,  146,  105,  146,  105,  146,
+      101,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  107,  146,
+      105,  108,  146,  105,  146,  105,  110,  146,  105,  111,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      117,  146,  105,  118,  146,  105,  146,  105,  146,  105,
+
+      146,  105,  122,  146,  105,  146,  105,  130,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  103,  105,  146,
+      105,  146,  105,  146,  105,  146,  105,  143,  146,  105,
+      146,  105,  146,   18,   13,  148,  149,  147,  147,  147,
+      102,  105,  146,  105,  146,  105,  146,   91,  105,  146,
+      105,  146,   74,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,   97,  105,  146,  105,  109,  146,  105,
+
+      112,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+      104,  105,  146,  105,  120,  146,  105,  146,  105,  146,
+      105,  146,  105,  146,  105,  134,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      141,  146,  105,  146,  105,  146,  105,  145,  146,   15,
+      147,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  116,  146,  105,  119,  146,  105,
+
+      124,  146,  105,  146,  105,  146,  105,  133,  146,  105,
+      135,  146,  105,  136,  146,  105,  137,  146,  105,  138,
+      146,  105,  139,  146,  105,  146,  105,  146,  105,  146,
+       14,   16,    5,  105,  146,  105,  146,  105,  146,   75,
+      105,  146,  105,  146,   93,  105,  146,   78,  105,  146,
+      105,  146,  105,  146,  105,  146,  105,  146,   98,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  114,  146,
+      105,  146,  105,  146,  105,  140,  146,  105,  146,  105,
+      146,   12,  105,  146,  105,  146,  105,  146,  105,  146,
+
+      105,  146,  105,  146,   81,  105,  146,  105,  129,  146,
+      105,  146,  105,  146,   84,  105,  146,  105,  146,   88,
+      105,  146,  105,  146,  105,  146,  105,  113,  146,  105,
+      131,  146,  105,  132,  146,  105,  142,  146,  105,  144,
+      146,    8,   11,   19,   17,  105,  146,  105,  146,   83,
+      105,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+      105,  146,   82,  105,  146,  105,  146,  105,  146,   96,
+      105,  146,  105,  128,  146,  105,  146,    7,    8,  105,
+      146,  105,  146,  105,  146,  105,  146,  105,  146,   80,
+      105,  146,  105,  127,  146,   86,  105,  146,   85,  105,
+
+      146,  105,  146,   89,  105,  146,  105,  146,  105,  146,
+       77,  105,  146,  105,  146,  105,  146,  105,  126,  146,
+      105,  146,  105,  146,  105,  146,  105,  146,  105,  146,
+       87,  105,  146,   90,  105,  146,  105,  146,  105,  146,
+       76,  105,  146,   95,   79,  105,  146,  105,  146,  105,
+      146,   71,  105,  146,  105,  146,  105,  146,  105,  146,
+       72,   99,  105,  146,  105,  146,  100,  105,  146,   73,
+        9,    9,   12,   10,   10,   11,   94,   92
     } ;
 
 static yyconst flex_int16_t yy_accept[678] =
@@ -532,30 +532,30 @@
       757,  759,  762,  764,  766,  768,  770,  772,  774,  776,
       778,  781,  783,  785,  788,  790,  792,  792,  792,  792,
       792,  793,  793,  793,  793,  793,  793,  795,  797,  799,
-      799,  799,  801,  803,  805,  808,  811,  813,  815,  817,
-      819,  822,  824,  826,  829,  832,  835,  835,  838,  841,
-      842,  842,  842,  842,  842,  842,  843,  843,  843,  844,
-      844,  845,  847,  849,  852,  852,  852,  852,  854,  856,
-
-      858,  860,  862,  865,  867,  869,  872,  875,  877,  877,
-      878,  879,  879,  879,  879,  879,  881,  883,  883,  883,
-      883,  885,  887,  889,  892,  895,  898,  901,  903,  906,
-      906,  906,  906,  906,  906,  908,  910,  910,  910,  910,
-      913,  913,  913,  915,  917,  920,  922,  922,  922,  922,
-      922,  922,  924,  926,  926,  926,  926,  928,  928,  928,
-      928,  930,  933,  936,  936,  936,  936,  936,  936,  938,
-      940,  940,  940,  940,  943,  944,  944,  947,  947,  947,
-      947,  947,  947,  949,  951,  952,  952,  952,  952,  952,
-      952,  952,  952,  952,  954,  956,  956,  956,  956,  956,
-
-      956,  956,  956,  956,  958,  960,  960,  961,  961,  961,
-      961,  961,  961,  961,  964,  966,  966,  966,  966,  966,
-      966,  966,  966,  969,  969,  969,  969,  969,  969,  969,
-      969,  969,  969,  969,  969,  969,  969,  969,  970,  970,
-      970,  970,  970,  970,  970,  970,  970,  970,  970,  971,
-      971,  971,  973,  973,  973,  973,  973,  973,  973,  974,
-      974,  974,  976,  976,  976,  976,  977,  977,  977,  977,
-      977,  977,  977,  977,  977,  978,  978
+      799,  799,  801,  803,  805,  808,  811,  813,  815,  818,
+      820,  823,  825,  827,  830,  833,  836,  836,  839,  842,
+      843,  843,  843,  843,  843,  843,  844,  844,  844,  845,
+      845,  846,  848,  850,  853,  853,  853,  853,  855,  857,
+
+      859,  861,  863,  866,  868,  870,  873,  876,  878,  878,
+      879,  880,  880,  880,  880,  880,  882,  884,  884,  884,
+      884,  886,  888,  890,  893,  896,  899,  902,  904,  907,
+      907,  907,  907,  907,  907,  909,  911,  911,  911,  911,
+      914,  914,  914,  916,  918,  921,  923,  923,  923,  923,
+      923,  923,  925,  927,  927,  927,  927,  929,  929,  929,
+      929,  931,  934,  937,  937,  937,  937,  937,  937,  939,
+      941,  941,  941,  941,  944,  945,  945,  948,  948,  948,
+      948,  948,  948,  950,  952,  953,  953,  953,  953,  953,
+      953,  953,  953,  953,  955,  957,  957,  957,  957,  957,
+
+      957,  957,  957,  957,  959,  961,  961,  962,  962,  962,
+      962,  962,  962,  962,  965,  967,  967,  967,  967,  967,
+      967,  967,  967,  970,  970,  970,  970,  970,  970,  970,
+      970,  970,  970,  970,  970,  970,  970,  970,  971,  971,
+      971,  971,  971,  971,  971,  971,  971,  971,  971,  972,
+      972,  972,  974,  974,  974,  974,  974,  974,  974,  975,
+      975,  975,  977,  977,  977,  977,  978,  978,  978,  978,
+      978,  978,  978,  978,  978,  979,  979
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -1846,7 +1846,7 @@
 case 85:
 YY_RULE_SETUP
 #line 169 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+{ return SIGNED; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
@@ -1856,12 +1856,12 @@
 case 87:
 YY_RULE_SETUP
 #line 171 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+{ return RESTRICT; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 172 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+{ if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
@@ -1871,15 +1871,15 @@
 case 90:
 YY_RULE_SETUP
 #line 174 "giscanner/scannerlexer.l"
-{ return BOOL; }
+{ return VOLATILE; }
 	YY_BREAK
 case 91:
-/* rule 91 can match eol */
 YY_RULE_SETUP
 #line 175 "giscanner/scannerlexer.l"
-{ /* Ignore */ }
+{ return BOOL; }
 	YY_BREAK
 case 92:
+/* rule 92 can match eol */
 YY_RULE_SETUP
 #line 176 "giscanner/scannerlexer.l"
 { /* Ignore */ }
@@ -1897,7 +1897,7 @@
 case 95:
 YY_RULE_SETUP
 #line 179 "giscanner/scannerlexer.l"
-{ /* ignore */ }
+{ /* Ignore */ }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
@@ -1907,22 +1907,22 @@
 case 97:
 YY_RULE_SETUP
 #line 181 "giscanner/scannerlexer.l"
-{ return INT; }
+{ /* ignore */ }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 184 "giscanner/scannerlexer.l"
-{ return INTL_CONST; }
+#line 182 "giscanner/scannerlexer.l"
+{ return INT; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 185 "giscanner/scannerlexer.l"
-{ return INTUL_CONST; }
+{ return INTL_CONST; }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 187 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 186 "giscanner/scannerlexer.l"
+{ return INTUL_CONST; }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
@@ -1941,108 +1941,108 @@
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 192 "giscanner/scannerlexer.l"
-{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
+#line 191 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 194 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+#line 193 "giscanner/scannerlexer.l"
+{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 195 "giscanner/scannerlexer.l"
-{ return AUTO; }
+{ if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 196 "giscanner/scannerlexer.l"
-{ return BOOL; }
+{ return AUTO; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 197 "giscanner/scannerlexer.l"
-{ return BREAK; }
+{ return BOOL; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 198 "giscanner/scannerlexer.l"
-{ return CASE; }
+{ return BREAK; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
 #line 199 "giscanner/scannerlexer.l"
-{ return CHAR; }
+{ return CASE; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
 #line 200 "giscanner/scannerlexer.l"
-{ return CONST; }
+{ return CHAR; }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 201 "giscanner/scannerlexer.l"
-{ return CONTINUE; }
+{ return CONST; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 202 "giscanner/scannerlexer.l"
-{ return DEFAULT; }
+{ return CONTINUE; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 203 "giscanner/scannerlexer.l"
-{ return DO; }
+{ return DEFAULT; }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 204 "giscanner/scannerlexer.l"
-{ return DOUBLE; }
+{ return DO; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
 #line 205 "giscanner/scannerlexer.l"
-{ return ELSE; }
+{ return DOUBLE; }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
 #line 206 "giscanner/scannerlexer.l"
-{ return ENUM; }
+{ return ELSE; }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 207 "giscanner/scannerlexer.l"
-{ return EXTERN; }
+{ return ENUM; }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
 #line 208 "giscanner/scannerlexer.l"
-{ return FLOAT; }
+{ return EXTERN; }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
 #line 209 "giscanner/scannerlexer.l"
-{ return FOR; }
+{ return FLOAT; }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
 #line 210 "giscanner/scannerlexer.l"
-{ return GOTO; }
+{ return FOR; }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
 #line 211 "giscanner/scannerlexer.l"
-{ return IF; }
+{ return GOTO; }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
 #line 212 "giscanner/scannerlexer.l"
-{ return INLINE; }
+{ return IF; }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
 #line 213 "giscanner/scannerlexer.l"
-{ return INT; }
+{ return INLINE; }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
@@ -2067,92 +2067,92 @@
 case 129:
 YY_RULE_SETUP
 #line 218 "giscanner/scannerlexer.l"
-{ return LONG; }
+{ return INT; }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
 #line 219 "giscanner/scannerlexer.l"
-{ return REGISTER; }
+{ return LONG; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
 #line 220 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+{ return REGISTER; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
 #line 221 "giscanner/scannerlexer.l"
-{ return RETURN; }
+{ return RESTRICT; }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
 #line 222 "giscanner/scannerlexer.l"
-{ return SHORT; }
+{ return RETURN; }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
 #line 223 "giscanner/scannerlexer.l"
-{ return SIGNED; }
+{ return SHORT; }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
 #line 224 "giscanner/scannerlexer.l"
-{ return SIZEOF; }
+{ return SIGNED; }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
 #line 225 "giscanner/scannerlexer.l"
-{ return STATIC; }
+{ return SIZEOF; }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
 #line 226 "giscanner/scannerlexer.l"
-{ return STRUCT; }
+{ return STATIC; }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
 #line 227 "giscanner/scannerlexer.l"
-{ return SWITCH; }
+{ return STRUCT; }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
 #line 228 "giscanner/scannerlexer.l"
-{ return TYPEDEF; }
+{ return SWITCH; }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
 #line 229 "giscanner/scannerlexer.l"
-{ return UNION; }
+{ return TYPEDEF; }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
 #line 230 "giscanner/scannerlexer.l"
-{ return UNSIGNED; }
+{ return UNION; }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
 #line 231 "giscanner/scannerlexer.l"
-{ return VOID; }
+{ return UNSIGNED; }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
 #line 232 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+{ return VOID; }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
 #line 233 "giscanner/scannerlexer.l"
-{ return WHILE; }
+{ return VOLATILE; }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 235 "giscanner/scannerlexer.l"
-{ return check_identifier(scanner, yytext); }
+#line 234 "giscanner/scannerlexer.l"
+{ return WHILE; }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 237 "giscanner/scannerlexer.l"
-{ return INTEGER; }
+#line 236 "giscanner/scannerlexer.l"
+{ return check_identifier(scanner, yytext); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
@@ -2166,8 +2166,8 @@
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 241 "giscanner/scannerlexer.l"
-{ return FLOATING; }
+#line 240 "giscanner/scannerlexer.l"
+{ return INTEGER; }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
@@ -2175,10 +2175,9 @@
 { return FLOATING; }
 	YY_BREAK
 case 151:
-/* rule 151 can match eol */
 YY_RULE_SETUP
-#line 244 "giscanner/scannerlexer.l"
-{ return CHARACTER; }
+#line 243 "giscanner/scannerlexer.l"
+{ return FLOATING; }
 	YY_BREAK
 case 152:
 /* rule 152 can match eol */
@@ -2189,8 +2188,8 @@
 case 153:
 /* rule 153 can match eol */
 YY_RULE_SETUP
-#line 247 "giscanner/scannerlexer.l"
-{ return STRING; }
+#line 246 "giscanner/scannerlexer.l"
+{ return CHARACTER; }
 	YY_BREAK
 case 154:
 /* rule 154 can match eol */
@@ -2199,16 +2198,22 @@
 { return STRING; }
 	YY_BREAK
 case 155:
+/* rule 155 can match eol */
 YY_RULE_SETUP
-#line 250 "giscanner/scannerlexer.l"
-{ print_error(scanner); }
+#line 249 "giscanner/scannerlexer.l"
+{ return STRING; }
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 252 "giscanner/scannerlexer.l"
+#line 251 "giscanner/scannerlexer.l"
+{ print_error(scanner); }
+	YY_BREAK
+case 157:
+YY_RULE_SETUP
+#line 253 "giscanner/scannerlexer.l"
 ECHO;
 	YY_BREAK
-#line 2212 "scannerlexer.c"
+#line 2217 "scannerlexer.c"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
@@ -3139,7 +3144,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 252 "giscanner/scannerlexer.l"
+#line 253 "giscanner/scannerlexer.l"
 
 
 
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_nullable_in.page gobject-introspection-1.46.0/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_nullable_in.page
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_nullable_in.page	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_nullable_in.page	2015-09-09 10:20:37.000000000 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<page id="Regress.func_obj_nullable_in"
+      type="topic"
+      style="function"
+      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="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_func_obj_nullable_in</api:name>
+      <api:arg>
+        <api:type>RegressTestObj*</api:type>
+        <api:name>obj</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>regress_func_obj_nullable_in</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_func_obj_nullable_in (RegressTestObj* obj);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+  <p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_gtype_container_in.page gobject-introspection-1.46.0/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_gtype_container_in.page
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_gtype_container_in.page	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_gtype_container_in.page	2015-07-18 13:27:49.000000000 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<page id="Regress.test_glist_gtype_container_in"
+      type="topic"
+      style="function"
+      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="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_glist_gtype_container_in</api:name>
+      <api:arg>
+        <api:type>GList*</api:type>
+        <api:name>in</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>regress_test_glist_gtype_container_in</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_test_glist_gtype_container_in (GList* in);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-expected.gir gobject-introspection-1.46.0/tests/scanner/Regress-1.0-expected.gir
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-expected.gir	2015-06-22 17:07:46.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-expected.gir	2015-09-09 10:20:37.000000000 +0000
@@ -4761,6 +4761,21 @@
         </parameter>
       </parameters>
     </function>
+    <function name="func_obj_nullable_in"
+              c:identifier="regress_func_obj_nullable_in">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="obj"
+                   transfer-ownership="none"
+                   nullable="1"
+                   allow-none="1">
+          <doc xml:space="preserve">A #RegressTestObj</doc>
+          <type name="TestObj" c:type="RegressTestObj*"/>
+        </parameter>
+      </parameters>
+    </function>
     <function name="global_get_flags_out"
               c:identifier="regress_global_get_flags_out">
       <return-value transfer-ownership="none">
@@ -5718,6 +5733,19 @@
         </type>
       </return-value>
     </function>
+    <function name="test_glist_gtype_container_in"
+              c:identifier="regress_test_glist_gtype_container_in">
+      <return-value transfer-ownership="none">
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="in" transfer-ownership="container">
+          <type name="GLib.List" c:type="GList*">
+            <type name="GType"/>
+          </type>
+        </parameter>
+      </parameters>
+    </function>
     <function name="test_glist_nothing_in"
               c:identifier="regress_test_glist_nothing_in">
       <return-value transfer-ownership="none">
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_nullable_in.page gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_nullable_in.page
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_nullable_in.page	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_nullable_in.page	2015-09-09 10:20:37.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<page id="Regress.func_obj_nullable_in"
+      type="topic"
+      style="function"
+      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="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_func_obj_nullable_in</api:name>
+      <api:arg>
+        <api:type>Regress.TestObj</api:type>
+        <api:name>obj</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.func_obj_nullable_in</title>
+  <synopsis><code mime="text/x-gjs">
+function func_obj_nullable_in(obj: <link xref="Regress.TestObj">Regress.TestObj</link>): void {
+    // Gjs wrapper for regress_func_obj_nullable_in()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+  <p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
+
+</page>
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_gtype_container_in.page gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_gtype_container_in.page
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_gtype_container_in.page	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_gtype_container_in.page	2015-07-18 13:27:49.000000000 +0000
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<page id="Regress.test_glist_gtype_container_in"
+      type="topic"
+      style="function"
+      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="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_glist_gtype_container_in</api:name>
+      <api:arg>
+        <api:type>Array(GObject.Type)</api:type>
+        <api:name>in</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.test_glist_gtype_container_in</title>
+  <synopsis><code mime="text/x-gjs">
+function test_glist_gtype_container_in(in: Array(GObject.Type)): void {
+    // Gjs wrapper for regress_test_glist_gtype_container_in()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
+
+</page>
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_nullable_in.page gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_nullable_in.page
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_nullable_in.page	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_nullable_in.page	2015-09-09 10:20:37.000000000 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.func_obj_nullable_in"
+      type="topic"
+      style="function"
+      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="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_func_obj_nullable_in</api:name>
+      <api:arg>
+        <api:type>Regress.TestObj</api:type>
+        <api:name>obj</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.func_obj_nullable_in</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestObj)
+@returns(none)
+def func_obj_nullable_in(obj):
+    # Python wrapper for regress_func_obj_nullable_in()
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+  <p>A <link xref="Regress.TestObj"/></p>
+</item>
+</terms>
+
+</page>
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_gtype_container_in.page gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_gtype_container_in.page
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_gtype_container_in.page	1970-01-01 00:00:00.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_gtype_container_in.page	2015-07-18 13:27:49.000000000 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.test_glist_gtype_container_in"
+      type="topic"
+      style="function"
+      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="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_test_glist_gtype_container_in</api:name>
+      <api:arg>
+        <api:type>[GType]</api:type>
+        <api:name>in</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.test_glist_gtype_container_in</title>
+  <synopsis><code mime="text/x-python">
+@accepts([GType])
+@returns(none)
+def test_glist_gtype_container_in(in):
+    # Python wrapper for regress_test_glist_gtype_container_in()
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>in</code></title>
+
+</item>
+</terms>
+
+</page>
diff -Nru gobject-introspection-1.45.3/tests/scanner/Regress-1.0-sections-expected.txt gobject-introspection-1.46.0/tests/scanner/Regress-1.0-sections-expected.txt
--- gobject-introspection-1.45.3/tests/scanner/Regress-1.0-sections-expected.txt	2015-06-22 17:07:46.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/Regress-1.0-sections-expected.txt	2015-09-09 10:20:37.000000000 +0000
@@ -46,6 +46,7 @@
 regress_foo_test_varargs_callback2
 regress_foo_test_varargs_callback3
 regress_func_obj_null_in
+regress_func_obj_nullable_in
 regress_global_get_flags_out
 regress_has_parameter_named_attrs
 regress_introspectable_via_alias
@@ -119,6 +120,7 @@
 regress_test_ghash_null_return
 regress_test_glist_container_return
 regress_test_glist_everything_return
+regress_test_glist_gtype_container_in
 regress_test_glist_nothing_in
 regress_test_glist_nothing_in2
 regress_test_glist_nothing_return
diff -Nru gobject-introspection-1.45.3/tests/scanner/regress.c gobject-introspection-1.46.0/tests/scanner/regress.c
--- gobject-introspection-1.45.3/tests/scanner/regress.c	2015-06-19 21:06:04.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/regress.c	2015-09-09 10:20:37.000000000 +0000
@@ -990,6 +990,24 @@
 }
 
 /**
+ * regress_test_glist_gtype_container_in:
+ * @in: (element-type GType) (transfer container):
+ */
+void
+regress_test_glist_gtype_container_in (GList *in)
+{
+  GList *l = in;
+
+  g_assert (GPOINTER_TO_SIZE (l->data) == REGRESS_TEST_TYPE_OBJ);
+  l = l->next;
+  g_assert (GPOINTER_TO_SIZE (l->data) == REGRESS_TEST_TYPE_SUB_OBJ);
+  l = l->next;
+  g_assert (l == NULL);
+
+  g_list_free (in);
+}
+
+/**
  * regress_test_glist_nothing_in:
  * @in: (element-type utf8):
  */
@@ -2984,6 +3002,15 @@
 }
 
 /**
+ * regress_func_obj_nullable_in:
+ * @obj: (nullable): A #RegressTestObj
+ */
+void
+regress_func_obj_nullable_in (RegressTestObj *obj)
+{
+}
+
+/**
  * regress_test_array_fixed_out_objects:
  * @objs: (out) (array fixed-size=2) (transfer full): An array of #RegressTestObj
  */
diff -Nru gobject-introspection-1.45.3/tests/scanner/regress.h gobject-introspection-1.46.0/tests/scanner/regress.h
--- gobject-introspection-1.45.3/tests/scanner/regress.h	2015-06-18 23:38:16.000000000 +0000
+++ gobject-introspection-1.46.0/tests/scanner/regress.h	2015-09-09 10:20:37.000000000 +0000
@@ -206,6 +206,9 @@
 GList *regress_test_glist_everything_return (void);
 
 _GI_TEST_EXTERN
+void regress_test_glist_gtype_container_in (GList *in);
+
+_GI_TEST_EXTERN
 void regress_test_glist_nothing_in (const GList *in);
 
 _GI_TEST_EXTERN
@@ -915,6 +918,8 @@
 _GI_TEST_EXTERN
 void regress_test_obj_null_out (RegressTestObj **obj);
 
+void regress_func_obj_nullable_in (RegressTestObj *obj);
+
 /* inheritance */
 #define REGRESS_TEST_TYPE_SUB_OBJ           (regress_test_sub_obj_get_type ())
 #define REGRESS_TEST_SUB_OBJECT(object)     (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_TEST_TYPE_SUB_OBJ, RegressTestSubObj))
diff -Nru gobject-introspection-1.45.3/tools/compiler.c gobject-introspection-1.46.0/tools/compiler.c
--- gobject-introspection-1.45.3/tools/compiler.c	2013-10-15 23:00:06.000000000 +0000
+++ gobject-introspection-1.46.0/tools/compiler.c	2015-08-10 08:24:23.000000000 +0000
@@ -153,6 +153,15 @@
   g_option_context_parse (context, &argc, &argv, &error);
   g_option_context_free (context);
 
+  if (error)
+    {
+      g_fprintf (stderr, "error parsing arguments: %s\n", error->message);
+
+      g_error_free (error);
+
+      return 1;
+    }
+
   logged_levels = G_LOG_LEVEL_MASK & ~(G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_DEBUG);
   if (debug)
     logged_levels = logged_levels | G_LOG_LEVEL_DEBUG;