gobject-introspection 3.0.7-x86-mingw32 → 3.0.8-x86-mingw32

data/vendor/local/share/gobject-introspection-1.0/Makefile.introspection

@@ -68,7 +68,7 @@ _gir_export_packages = $(foreach pkg,$($(_gir_name)_EXPORT_PACKAGES),--pkg-expor
 # a command-line argument --libtool="/bin/sh ../../libtool" into
 # --libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
 # because we already "know" where the libtool configure produced is.
-_gir_libtool = $(if $(findstring MINGW32,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
+_gir_libtool = $(if $(findstring MINGW,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
 
 # Macros for AM_SILENT_RULES prettiness
 _gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
@@ -84,6 +84,8 @@ _gir_silent_compiler = $(_gir_silent_compiler_$(V))
 _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity))
 _gir_silent_compiler_0 = @echo "  GICOMP   $(1)";
 
+_gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)"
+
 #
 # Creates a GIR by scanning C headers/sources
 # $(1) - Name of the gir file (output)
@@ -131,7 +133,7 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_SCANNERFLAGS)),
 # needs to be added manually.
 $(1): $$($(_gir_name)_FILES)
 	@ $(MKDIR_P) $(dir $(1))
-	$(_gir_silent_scanner_prefix) $(INTROSPECTION_SCANNER_ENV) $(INTROSPECTION_SCANNER) $(_gir_silent_scanner_opts) \
+	$(_gir_silent_scanner_prefix) $(_gir_default_scanner_env) $(INTROSPECTION_SCANNER_ENV) $(INTROSPECTION_SCANNER) $(_gir_silent_scanner_opts) \
 	$(INTROSPECTION_SCANNER_ARGS) \
 	  --namespace=$(_gir_namespace) \
 	  --nsversion=$(_gir_version) \

data/vendor/local/share/gobject-introspection-1.0/gdump.c

@@ -204,6 +204,7 @@ dump_signals (GType type, GOutputStream *out)
 	}
       goutput_write (out, "    </signal>\n");
     }
+  g_free (sig_ids);
 }
 
 static void
@@ -249,6 +250,8 @@ dump_object_type (GType type, const char *symbol, GOutputStream *out)
       escaped_printf (out, "    <implements name=\"%s\"/>\n",
 		      g_type_name (itype));
     }
+  g_free (interfaces);
+
   dump_properties (type, out);
   dump_signals (type, out);
   goutput_write (out, "  </class>\n");
@@ -280,6 +283,8 @@ dump_interface_type (GType type, const char *symbol, GOutputStream *out)
       escaped_printf (out, "    <prerequisite name=\"%s\"/>\n",
 		      g_type_name (itype));
     }
+  g_free (interfaces);
+
   dump_properties (type, out);
   dump_signals (type, out);
   goutput_write (out, "  </interface>\n");
@@ -379,6 +384,7 @@ dump_fundamental_type (GType type, const char *symbol, GOutputStream *out)
       escaped_printf (out, "    <implements name=\"%s\"/>\n",
 		      g_type_name (itype));
     }
+  g_free (interfaces);
   goutput_write (out, "  </fundamental>\n");
 }
 
@@ -471,6 +477,8 @@ g_irepository_dump (const char *arg, GError **error)
   input_file = g_file_new_for_path (args[0]);
   output_file = g_file_new_for_path (args[1]);
 
+  g_strfreev (args);
+
   input = g_file_read (input_file, NULL, error);
   if (input == NULL)
     return FALSE;

data/vendor/local/share/gobject-introspection-1.0/tests/everything.c

@@ -7,8 +7,6 @@
  * everything_nullfunc:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -17,12 +15,54 @@ everything_nullfunc (void)
   return;
 }
 
+/**
+ * everything_const_return_gpointer:
+ *
+ * Undocumented.
+ *
+ * Returns:  (transfer none)
+ */
+_GI_TEST_EXTERN
+gpointer
+everything_const_return_gpointer (void)
+{
+  return NULL;
+}
+
+/**
+ * everything_const_return_gintptr:
+ *
+ * Undocumented.
+ *
+ * Returns:  (transfer none)
+ */
+_GI_TEST_EXTERN
+gintptr
+everything_const_return_gintptr (void)
+{
+  return 0;
+}
+
+/**
+ * everything_const_return_guintptr:
+ *
+ * Undocumented.
+ *
+ * Returns:  (transfer none)
+ */
+_GI_TEST_EXTERN
+guintptr
+everything_const_return_guintptr (void)
+{
+  return 0;
+}
+
 /**
  * everything_const_return_gboolean:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gboolean
@@ -36,7 +76,7 @@ everything_const_return_gboolean (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint8
@@ -50,7 +90,7 @@ everything_const_return_gint8 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint8
@@ -64,7 +104,7 @@ everything_const_return_guint8 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint16
@@ -78,7 +118,7 @@ everything_const_return_gint16 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint16
@@ -92,7 +132,7 @@ everything_const_return_guint16 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint32
@@ -106,7 +146,7 @@ everything_const_return_gint32 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint32
@@ -120,7 +160,7 @@ everything_const_return_guint32 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint64
@@ -134,7 +174,7 @@ everything_const_return_gint64 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint64
@@ -148,7 +188,7 @@ everything_const_return_guint64 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gchar
@@ -162,7 +202,7 @@ everything_const_return_gchar (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gshort
@@ -176,7 +216,7 @@ everything_const_return_gshort (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gushort
@@ -190,7 +230,7 @@ everything_const_return_gushort (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint
@@ -204,7 +244,7 @@ everything_const_return_gint (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint
@@ -218,7 +258,7 @@ everything_const_return_guint (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 glong
@@ -232,7 +272,7 @@ everything_const_return_glong (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gulong
@@ -246,7 +286,7 @@ everything_const_return_gulong (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gsize
@@ -260,7 +300,7 @@ everything_const_return_gsize (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gssize
@@ -269,40 +309,12 @@ everything_const_return_gssize (void)
   return 0;
 }
 
-/**
- * everything_const_return_gintptr:
- *
- * Undocumented.
- *
- * Returns: (transfer none)
- */
-_GI_TEST_EXTERN
-gintptr
-everything_const_return_gintptr (void)
-{
-  return 0;
-}
-
-/**
- * everything_const_return_guintptr:
- *
- * Undocumented.
- *
- * Returns: (transfer none)
- */
-_GI_TEST_EXTERN
-guintptr
-everything_const_return_guintptr (void)
-{
-  return 0;
-}
-
 /**
  * everything_const_return_gfloat:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gfloat
@@ -316,7 +328,7 @@ everything_const_return_gfloat (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gdouble
@@ -330,7 +342,7 @@ everything_const_return_gdouble (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gunichar
@@ -344,7 +356,7 @@ everything_const_return_gunichar (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 GType
@@ -358,7 +370,7 @@ everything_const_return_GType (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns:  (transfer none)
  */
 _GI_TEST_EXTERN
 const gchar*
@@ -372,7 +384,7 @@ everything_const_return_utf8 (void)
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns:  (transfer none)
  */
 _GI_TEST_EXTERN
 const gchar*
@@ -382,12 +394,49 @@ everything_const_return_filename (void)
 }
 
 /**
- * everything_oneparam_gboolean:
- * @arg0: :
+ * everything_oneparam_gpointer:
+ * @arg0:
+ *
+ * Undocumented.
+ */
+_GI_TEST_EXTERN
+void
+everything_oneparam_gpointer (gpointer arg0)
+{
+  return;
+}
+
+/**
+ * everything_oneparam_gintptr:
+ * @arg0:
+ *
+ * Undocumented.
+ */
+_GI_TEST_EXTERN
+void
+everything_oneparam_gintptr (gintptr arg0)
+{
+  return;
+}
+
+/**
+ * everything_oneparam_guintptr:
+ * @arg0:
  *
  * Undocumented.
+ */
+_GI_TEST_EXTERN
+void
+everything_oneparam_guintptr (guintptr arg0)
+{
+  return;
+}
+
+/**
+ * everything_oneparam_gboolean:
+ * @arg0:
  *
- * Returns: (transfer none)
+ * Undocumented.
  */
 _GI_TEST_EXTERN
 void
@@ -398,11 +447,9 @@ everything_oneparam_gboolean (gboolean arg0)
 
 /**
  * everything_oneparam_gint8:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -413,11 +460,9 @@ everything_oneparam_gint8 (gint8 arg0)
 
 /**
  * everything_oneparam_guint8:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -428,11 +473,9 @@ everything_oneparam_guint8 (guint8 arg0)
 
 /**
  * everything_oneparam_gint16:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -443,11 +486,9 @@ everything_oneparam_gint16 (gint16 arg0)
 
 /**
  * everything_oneparam_guint16:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -458,11 +499,9 @@ everything_oneparam_guint16 (guint16 arg0)
 
 /**
  * everything_oneparam_gint32:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -473,11 +512,9 @@ everything_oneparam_gint32 (gint32 arg0)
 
 /**
  * everything_oneparam_guint32:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -488,11 +525,9 @@ everything_oneparam_guint32 (guint32 arg0)
 
 /**
  * everything_oneparam_gint64:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -503,11 +538,9 @@ everything_oneparam_gint64 (gint64 arg0)
 
 /**
  * everything_oneparam_guint64:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -518,11 +551,9 @@ everything_oneparam_guint64 (guint64 arg0)
 
 /**
  * everything_oneparam_gchar:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -533,11 +564,9 @@ everything_oneparam_gchar (gchar arg0)
 
 /**
  * everything_oneparam_gshort:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -548,11 +577,9 @@ everything_oneparam_gshort (gshort arg0)
 
 /**
  * everything_oneparam_gushort:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -563,11 +590,9 @@ everything_oneparam_gushort (gushort arg0)
 
 /**
  * everything_oneparam_gint:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -578,11 +603,9 @@ everything_oneparam_gint (gint arg0)
 
 /**
  * everything_oneparam_guint:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -593,11 +616,9 @@ everything_oneparam_guint (guint arg0)
 
 /**
  * everything_oneparam_glong:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -608,11 +629,9 @@ everything_oneparam_glong (glong arg0)
 
 /**
  * everything_oneparam_gulong:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -623,11 +642,9 @@ everything_oneparam_gulong (gulong arg0)
 
 /**
  * everything_oneparam_gsize:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -638,11 +655,9 @@ everything_oneparam_gsize (gsize arg0)
 
 /**
  * everything_oneparam_gssize:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -652,132 +667,130 @@ everything_oneparam_gssize (gssize arg0)
 }
 
 /**
- * everything_oneparam_gintptr:
- * @arg0: :
+ * everything_oneparam_gfloat:
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_gintptr (gintptr arg0)
+everything_oneparam_gfloat (gfloat arg0)
 {
   return;
 }
 
 /**
- * everything_oneparam_guintptr:
- * @arg0: :
+ * everything_oneparam_gdouble:
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_guintptr (guintptr arg0)
+everything_oneparam_gdouble (gdouble arg0)
 {
   return;
 }
 
 /**
- * everything_oneparam_gfloat:
- * @arg0: :
+ * everything_oneparam_gunichar:
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_gfloat (gfloat arg0)
+everything_oneparam_gunichar (gunichar arg0)
 {
   return;
 }
 
 /**
- * everything_oneparam_gdouble:
- * @arg0: :
+ * everything_oneparam_GType:
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_gdouble (gdouble arg0)
+everything_oneparam_GType (GType arg0)
 {
   return;
 }
 
 /**
- * everything_oneparam_gunichar:
- * @arg0: :
+ * everything_oneparam_utf8:
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_gunichar (gunichar arg0)
+everything_oneparam_utf8 (const gchar* arg0)
 {
   return;
 }
 
 /**
- * everything_oneparam_GType:
- * @arg0: :
+ * everything_oneparam_filename:
+ * @arg0:
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_GType (GType arg0)
+everything_oneparam_filename (const gchar* arg0)
 {
   return;
 }
 
 /**
- * everything_oneparam_utf8:
- * @arg0: :
+ * everything_one_outparam_gpointer:
+ * @arg0: (out)  (transfer none):
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_utf8 (const gchar* arg0)
+everything_one_outparam_gpointer (gpointer* arg0)
 {
+  *arg0 = 0;
   return;
 }
 
 /**
- * everything_oneparam_filename:
- * @arg0: :
+ * everything_one_outparam_gintptr:
+ * @arg0: (out)  (transfer none):
  *
  * Undocumented.
+ */
+_GI_TEST_EXTERN
+void
+everything_one_outparam_gintptr (gintptr* arg0)
+{
+  *arg0 = 0;
+  return;
+}
+
+/**
+ * everything_one_outparam_guintptr:
+ * @arg0: (out)  (transfer none):
  *
- * Returns: (transfer none)
+ * Undocumented.
  */
 _GI_TEST_EXTERN
 void
-everything_oneparam_filename (const gchar* arg0)
+everything_one_outparam_guintptr (guintptr* arg0)
 {
+  *arg0 = 0;
   return;
 }
 
 /**
  * everything_one_outparam_gboolean:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -789,11 +802,9 @@ everything_one_outparam_gboolean (gboolean* arg0)
 
 /**
  * everything_one_outparam_gint8:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -805,11 +816,9 @@ everything_one_outparam_gint8 (gint8* arg0)
 
 /**
  * everything_one_outparam_guint8:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -821,11 +830,9 @@ everything_one_outparam_guint8 (guint8* arg0)
 
 /**
  * everything_one_outparam_gint16:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -837,11 +844,9 @@ everything_one_outparam_gint16 (gint16* arg0)
 
 /**
  * everything_one_outparam_guint16:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -853,11 +858,9 @@ everything_one_outparam_guint16 (guint16* arg0)
 
 /**
  * everything_one_outparam_gint32:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -869,11 +872,9 @@ everything_one_outparam_gint32 (gint32* arg0)
 
 /**
  * everything_one_outparam_guint32:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -885,11 +886,9 @@ everything_one_outparam_guint32 (guint32* arg0)
 
 /**
  * everything_one_outparam_gint64:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -901,11 +900,9 @@ everything_one_outparam_gint64 (gint64* arg0)
 
 /**
  * everything_one_outparam_guint64:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -917,11 +914,9 @@ everything_one_outparam_guint64 (guint64* arg0)
 
 /**
  * everything_one_outparam_gchar:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -933,11 +928,9 @@ everything_one_outparam_gchar (gchar* arg0)
 
 /**
  * everything_one_outparam_gshort:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -949,11 +942,9 @@ everything_one_outparam_gshort (gshort* arg0)
 
 /**
  * everything_one_outparam_gushort:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -965,11 +956,9 @@ everything_one_outparam_gushort (gushort* arg0)
 
 /**
  * everything_one_outparam_gint:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -981,11 +970,9 @@ everything_one_outparam_gint (gint* arg0)
 
 /**
  * everything_one_outparam_guint:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -997,11 +984,9 @@ everything_one_outparam_guint (guint* arg0)
 
 /**
  * everything_one_outparam_glong:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -1013,11 +998,9 @@ everything_one_outparam_glong (glong* arg0)
 
 /**
  * everything_one_outparam_gulong:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -1029,11 +1012,9 @@ everything_one_outparam_gulong (gulong* arg0)
 
 /**
  * everything_one_outparam_gsize:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -1045,11 +1026,9 @@ everything_one_outparam_gsize (gsize* arg0)
 
 /**
  * everything_one_outparam_gssize:
- * @arg0: (out) (transfer none):
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
@@ -1060,140 +1039,141 @@ everything_one_outparam_gssize (gssize* arg0)
 }
 
 /**
- * everything_one_outparam_gintptr:
- * @arg0: (out) (transfer none):
+ * everything_one_outparam_gfloat:
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_one_outparam_gintptr (gintptr* arg0)
+everything_one_outparam_gfloat (gfloat* arg0)
 {
   *arg0 = 0;
   return;
 }
 
 /**
- * everything_one_outparam_guintptr:
- * @arg0: (out) (transfer none):
+ * everything_one_outparam_gdouble:
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_one_outparam_guintptr (guintptr* arg0)
+everything_one_outparam_gdouble (gdouble* arg0)
 {
   *arg0 = 0;
   return;
 }
 
 /**
- * everything_one_outparam_gfloat:
- * @arg0: (out) (transfer none):
+ * everything_one_outparam_gunichar:
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_one_outparam_gfloat (gfloat* arg0)
+everything_one_outparam_gunichar (gunichar* arg0)
 {
   *arg0 = 0;
   return;
 }
 
 /**
- * everything_one_outparam_gdouble:
- * @arg0: (out) (transfer none):
+ * everything_one_outparam_GType:
+ * @arg0: (out) :
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_one_outparam_gdouble (gdouble* arg0)
+everything_one_outparam_GType (GType* arg0)
 {
   *arg0 = 0;
   return;
 }
 
 /**
- * everything_one_outparam_gunichar:
- * @arg0: (out) (transfer none):
+ * everything_one_outparam_utf8:
+ * @arg0: (out)  (transfer none):
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_one_outparam_gunichar (gunichar* arg0)
+everything_one_outparam_utf8 (const gchar** arg0)
 {
   *arg0 = 0;
   return;
 }
 
 /**
- * everything_one_outparam_GType:
- * @arg0: (out) (transfer none):
+ * everything_one_outparam_filename:
+ * @arg0: (out)  (transfer none):
  *
  * Undocumented.
- *
- * Returns: (transfer none)
  */
 _GI_TEST_EXTERN
 void
-everything_one_outparam_GType (GType* arg0)
+everything_one_outparam_filename (const gchar** arg0)
 {
   *arg0 = 0;
   return;
 }
 
 /**
- * everything_one_outparam_utf8:
- * @arg0: (out) (transfer none):
+ * everything_passthrough_one_gpointer:
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns:  (transfer none)
  */
 _GI_TEST_EXTERN
-void
-everything_one_outparam_utf8 (const gchar** arg0)
+gpointer
+everything_passthrough_one_gpointer (gpointer arg0)
 {
-  *arg0 = 0;
-  return;
+  return arg0;
 }
 
 /**
- * everything_one_outparam_filename:
- * @arg0: (out) (transfer none):
+ * everything_passthrough_one_gintptr:
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns:  (transfer none)
  */
 _GI_TEST_EXTERN
-void
-everything_one_outparam_filename (const gchar** arg0)
+gintptr
+everything_passthrough_one_gintptr (gintptr arg0)
 {
-  *arg0 = 0;
-  return;
+  return arg0;
+}
+
+/**
+ * everything_passthrough_one_guintptr:
+ * @arg0:
+ *
+ * Undocumented.
+ *
+ * Returns:  (transfer none)
+ */
+_GI_TEST_EXTERN
+guintptr
+everything_passthrough_one_guintptr (guintptr arg0)
+{
+  return arg0;
 }
 
 /**
  * everything_passthrough_one_gboolean:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gboolean
@@ -1204,11 +1184,11 @@ everything_passthrough_one_gboolean (gboolean arg0)
 
 /**
  * everything_passthrough_one_gint8:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint8
@@ -1219,11 +1199,11 @@ everything_passthrough_one_gint8 (gint8 arg0)
 
 /**
  * everything_passthrough_one_guint8:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint8
@@ -1234,11 +1214,11 @@ everything_passthrough_one_guint8 (guint8 arg0)
 
 /**
  * everything_passthrough_one_gint16:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint16
@@ -1249,11 +1229,11 @@ everything_passthrough_one_gint16 (gint16 arg0)
 
 /**
  * everything_passthrough_one_guint16:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint16
@@ -1264,11 +1244,11 @@ everything_passthrough_one_guint16 (guint16 arg0)
 
 /**
  * everything_passthrough_one_gint32:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint32
@@ -1279,11 +1259,11 @@ everything_passthrough_one_gint32 (gint32 arg0)
 
 /**
  * everything_passthrough_one_guint32:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint32
@@ -1294,11 +1274,11 @@ everything_passthrough_one_guint32 (guint32 arg0)
 
 /**
  * everything_passthrough_one_gint64:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint64
@@ -1309,11 +1289,11 @@ everything_passthrough_one_gint64 (gint64 arg0)
 
 /**
  * everything_passthrough_one_guint64:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint64
@@ -1324,11 +1304,11 @@ everything_passthrough_one_guint64 (guint64 arg0)
 
 /**
  * everything_passthrough_one_gchar:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gchar
@@ -1339,11 +1319,11 @@ everything_passthrough_one_gchar (gchar arg0)
 
 /**
  * everything_passthrough_one_gshort:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gshort
@@ -1354,11 +1334,11 @@ everything_passthrough_one_gshort (gshort arg0)
 
 /**
  * everything_passthrough_one_gushort:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gushort
@@ -1369,11 +1349,11 @@ everything_passthrough_one_gushort (gushort arg0)
 
 /**
  * everything_passthrough_one_gint:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gint
@@ -1384,11 +1364,11 @@ everything_passthrough_one_gint (gint arg0)
 
 /**
  * everything_passthrough_one_guint:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 guint
@@ -1399,11 +1379,11 @@ everything_passthrough_one_guint (guint arg0)
 
 /**
  * everything_passthrough_one_glong:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 glong
@@ -1414,11 +1394,11 @@ everything_passthrough_one_glong (glong arg0)
 
 /**
  * everything_passthrough_one_gulong:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gulong
@@ -1429,11 +1409,11 @@ everything_passthrough_one_gulong (gulong arg0)
 
 /**
  * everything_passthrough_one_gsize:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gsize
@@ -1444,11 +1424,11 @@ everything_passthrough_one_gsize (gsize arg0)
 
 /**
  * everything_passthrough_one_gssize:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gssize
@@ -1457,43 +1437,13 @@ everything_passthrough_one_gssize (gssize arg0)
   return arg0;
 }
 
-/**
- * everything_passthrough_one_gintptr:
- * @arg0: :
- *
- * Undocumented.
- *
- * Returns: (transfer none)
- */
-_GI_TEST_EXTERN
-gintptr
-everything_passthrough_one_gintptr (gintptr arg0)
-{
-  return arg0;
-}
-
-/**
- * everything_passthrough_one_guintptr:
- * @arg0: :
- *
- * Undocumented.
- *
- * Returns: (transfer none)
- */
-_GI_TEST_EXTERN
-guintptr
-everything_passthrough_one_guintptr (guintptr arg0)
-{
-  return arg0;
-}
-
 /**
  * everything_passthrough_one_gfloat:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gfloat
@@ -1504,11 +1454,11 @@ everything_passthrough_one_gfloat (gfloat arg0)
 
 /**
  * everything_passthrough_one_gdouble:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gdouble
@@ -1519,11 +1469,11 @@ everything_passthrough_one_gdouble (gdouble arg0)
 
 /**
  * everything_passthrough_one_gunichar:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 gunichar
@@ -1534,11 +1484,11 @@ everything_passthrough_one_gunichar (gunichar arg0)
 
 /**
  * everything_passthrough_one_GType:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns: 
  */
 _GI_TEST_EXTERN
 GType
@@ -1549,11 +1499,11 @@ everything_passthrough_one_GType (GType arg0)
 
 /**
  * everything_passthrough_one_utf8:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns:  (transfer none)
  */
 _GI_TEST_EXTERN
 const gchar*
@@ -1564,11 +1514,11 @@ everything_passthrough_one_utf8 (const gchar* arg0)
 
 /**
  * everything_passthrough_one_filename:
- * @arg0: :
+ * @arg0:
  *
  * Undocumented.
  *
- * Returns: (transfer none)
+ * Returns:  (transfer none)
  */
 _GI_TEST_EXTERN
 const gchar*