vala r2185 - in trunk: . vapi vapi/packages/gdk-pixbuf-2.0

[juergbi svn gnome org]

Author: juergbi
Date: Tue Dec 16 20:15:18 2008
New Revision: 2185
URL: http://svn.gnome.org/viewvc/vala?rev=2185&view=rev

Log:
2008-12-16  JÃrg Billeter  <j bitron ch>

	* vapi/packages/gdk-pixbuf-2.0/:

	Fix gdk_pixbuf_new_from_stream* bindings, patch by Evan Nemerson,
	fixes bug 560721

	* vapi/gdk-pixbuf-2.0.vapi: regenerated


Modified:
   trunk/ChangeLog
   trunk/vapi/gdk-pixbuf-2.0.vapi
   trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata

Modified: trunk/vapi/gdk-pixbuf-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-pixbuf-2.0.vapi	(original)
+++ trunk/vapi/gdk-pixbuf-2.0.vapi	Tue Dec 16 20:15:18 2008
@@ -1,4 +1,4 @@
-/* gdk-pixbuf-2.0.vapi generated by vapigen, do not modify. */
+/* gdk-pixbuf-2.0.vapi generated by lt-vapigen, do not modify. */
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
@@ -28,9 +28,9 @@
 		public Pixbuf.from_inline (int data_length, uchar[] data, bool copy_pixels) throws GLib.Error;
 		public static weak Gdk.Pixbuf from_pixdata (Gdk.Pixdata pixdata, bool copy_pixels) throws GLib.Error;
 		[CCode (has_construct_function = false)]
-		public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable cancellable) throws GLib.Error;
+		public Pixbuf.from_stream (GLib.InputStream stream, GLib.Cancellable? cancellable) throws GLib.Error;
 		[CCode (has_construct_function = false)]
-		public Pixbuf.from_stream_at_scale (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable cancellable) throws GLib.Error;
+		public Pixbuf.from_stream_at_scale (GLib.InputStream stream, int width, int height, bool preserve_aspect_ratio, GLib.Cancellable? cancellable) throws GLib.Error;
 		[NoArrayLength]
 		[CCode (has_construct_function = false)]
 		public Pixbuf.from_xpm_data (string[] data);
@@ -140,7 +140,7 @@
 	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public class PixbufSimpleAnimIter : Gdk.PixbufAnimationIter {
 	}
-	[CCode (cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
+	[CCode (type_id = "GDK_TYPE_PIXDATA", cheader_filename = "gdk-pixbuf/gdk-pixdata.h")]
 	public struct Pixdata {
 		public uint magic;
 		public int length;

Modified: trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata	(original)
+++ trunk/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata	Tue Dec 16 20:15:18 2008
@@ -3,6 +3,8 @@
 gdk_pixbuf_new_from_data.destroy_fn nullable="1"
 gdk_pixbuf_new_from_data.destroy_fn_data hidden="1"
 gdk_pixbuf_new_from_data no_array_length="1"
+gdk_pixbuf_new_from_stream.cancellable nullable="1"
+gdk_pixbuf_new_from_stream_at_scale.cancellable nullable="1"
 gdk_pixbuf_new_from_xpm_data.data is_array="1"
 gdk_pixbuf_new_from_xpm_data no_array_length="1"
 gdk_pixbuf_new_from_inline.data is_array="1"