vala r2030 - in trunk: . vapi vapi/packages/gstreamer-0.10

[tvermeir svn gnome org]

Author: tvermeir
Date: Tue Nov 18 12:07:39 2008
New Revision: 2030
URL: http://svn.gnome.org/viewvc/vala?rev=2030&view=rev

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



Modified:
   trunk/ChangeLog
   trunk/vapi/gstreamer-0.10.vapi
   trunk/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata

Modified: trunk/vapi/gstreamer-0.10.vapi
==============================================================================
--- trunk/vapi/gstreamer-0.10.vapi	(original)
+++ trunk/vapi/gstreamer-0.10.vapi	Tue Nov 18 12:07:39 2008
@@ -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 @@
 		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);

Modified: trunk/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata
==============================================================================
--- trunk/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata	(original)
+++ trunk/vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata	Tue Nov 18 12:07:39 2008
@@ -237,6 +237,7 @@
 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"