From: Thijs Vermeir <tvermeir@src.gnome.org>
Date: Tue, 18 Nov 2008 12:07:39 +0000 (+0000)
Subject: Transfer ownership on gst_tag_list_merge regenerated
X-Git-Tag: VALA_0_5_2~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93140db2ca65d6ae5151892f13b18ab523978131;p=thirdparty%2Fvala.git

Transfer ownership on gst_tag_list_merge regenerated

	* vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata:
	Transfer ownership on gst_tag_list_merge
	* vapi/gstreamer-0.10.vapi: regenerated


svn path=/trunk/; revision=2030
---

diff --git a/ChangeLog b/ChangeLog
index 927e3f009..24d424ce2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-18  Thijs Vermeir  <thijsvermeir@gmail.com>
+
+	* vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata:
+
+	Transfer ownership on gst_tag_list_merge
+
+	* vapi/gstreamer-0.10.vapi: regenerated
+
 2008-11-17  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valaarraycreationexpression.vala:
diff --git a/vapi/gstreamer-0.10.vapi b/vapi/gstreamer-0.10.vapi
index 74465a0da..d83d78972 100644
--- a/vapi/gstreamer-0.10.vapi
+++ b/vapi/gstreamer-0.10.vapi
@@ -1,4 +1,4 @@
-/* gstreamer-0.10.vapi generated by lt-vapigen, do not modify. */
+/* gstreamer-0.10.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gst", lower_case_cprefix = "gst_")]
 namespace Gst {
@@ -1180,7 +1180,7 @@ namespace Gst {
 		public weak Gst.Value? get_value_index (string tag, uint index);
 		public void insert (Gst.TagList from, Gst.TagMergeMode mode);
 		public bool is_empty ();
-		public weak Gst.TagList merge (Gst.TagList list2, Gst.TagMergeMode mode);
+		public Gst.TagList merge (Gst.TagList list2, Gst.TagMergeMode mode);
 		[CCode (has_construct_function = false)]
 		public TagList ();
 		public void remove_tag (string tag);
diff --git a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
index 45e380dd3..7604c51af 100644
--- a/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
+++ b/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
@@ -237,6 +237,7 @@ gst_tag_list_get_uint64_index.value is_out="1"
 gst_tag_list_get_uint_index.value is_out="1"
 gst_tag_list_get_ulong.value is_out="1"
 gst_tag_list_get_ulong_index.value is_out="1"
+gst_tag_list_merge transfer_ownership="1"
 gst_value_array_append_value hidden="1"
 gst_value_array_get_size hidden="1"
 gst_value_array_get_type hidden="1"