luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-22 15:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 556739 – transfer-ownership attribute should be mandatory in .gir

Browse Source 
2008-10-23  Tommi Komulainen  <tommi.komulainen@iki.fi>

	* girepository/girparser.c (parse_param_transfer):
	* giscanner/transformer.py (_create_parameter, _create_return):
	* giscanner/girwriter.py (_write_return, _write_parameter):
	* tools/generate.c (write_callable_info): always write and
	require "transfer-ownership" for return-values and parameters

	* tests/boxed.gir:
	* tests/invoke/testfns-1.0.gir:
	* tests/object.gir:
	* tests/scanner/DrawableAdditions.xml:
	* tests/scanner/GtkFrob-1.0-expected.tgir:
	* tests/scanner/annotation-1.0-expected.tgir:
	* tests/scanner/drawable-1.0-expected.tgir:
	* tests/scanner/drawable-injected-1.0-expected.gir:
	* tests/scanner/drawable-injected-1.0-expected.tgir:
	* tests/scanner/foo-1.0-expected.tgir: Updated

svn path=/trunk/; revision=797
This commit is contained in:
Tommi Komulainen 2008-10-23 17:42:25 +00:00 committed by Philip Withnall
parent e4542c021c
commit d9ab34b17c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
girepository/tools/generate.c
View File

@ -382,11 +382,10 @@ write_callable_info (const gchar *namespace,
xml_start_element (file, "return-value"); xml_start_element (file, "return-value");
if (g_type_info_is_pointer (type))
{
switch (g_callable_info_get_caller_owns (info)) switch (g_callable_info_get_caller_owns (info))
{ {
case GI_TRANSFER_NOTHING: case GI_TRANSFER_NOTHING:
xml_printf (file, " transfer-ownership=\"none\"");
break; break;
case GI_TRANSFER_CONTAINER: case GI_TRANSFER_CONTAINER:
xml_printf (file, " transfer-ownership=\"container\""); xml_printf (file, " transfer-ownership=\"container\"");
@ -397,7 +396,6 @@ write_callable_info (const gchar *namespace,
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
}
if (g_callable_info_may_return_null (info)) if (g_callable_info_may_return_null (info))
xml_printf (file, " allow-none=\"1\""); xml_printf (file, " allow-none=\"1\"");
@ -421,6 +419,7 @@ write_callable_info (const gchar *namespace,
switch (g_arg_info_get_ownership_transfer (arg)) switch (g_arg_info_get_ownership_transfer (arg))
{ {
case GI_TRANSFER_NOTHING: case GI_TRANSFER_NOTHING:
xml_printf (file, " transfer-ownership=\"none\"");
break; break;
case GI_TRANSFER_CONTAINER: case GI_TRANSFER_CONTAINER:
xml_printf (file, " transfer-ownership=\"container\""); xml_printf (file, " transfer-ownership=\"container\"");