vala r1634 - in trunk: . vapi vapi/packages/gdk-2.0

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Mon Jun 23 05:50:26 2008
New Revision: 1634
URL: http://svn.gnome.org/viewvc/vala?rev=1634&view=rev

Log:
2008-06-23  Jaap A. Haitsma  <jaap haitsma org>

	* vapi/packages/gdk-2.0/gdk-2.0.metadata:
	Fix gdk_pixbuf_from_drawable and gdk_pixbuf_from_image bindings
	Fixes bug #539632
	* vapi/gdk-2.0.vapi: Regenerated


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

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Mon Jun 23 05:50:26 2008
@@ -1,4 +1,4 @@
-/* gdk-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gdk-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")]
 namespace Gdk {
@@ -1702,9 +1702,9 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void parse_args (int argc, string argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf dest, Gdk.Drawable src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	public static weak Gdk.Pixbuf pixbuf_get_from_drawable (Gdk.Pixbuf? dest, Gdk.Drawable src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static weak Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf dest, Gdk.Image src, Gdk.Colormap cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
+	public static weak Gdk.Pixbuf pixbuf_get_from_image (Gdk.Pixbuf? dest, Gdk.Image src, Gdk.Colormap? cmap, int src_x, int src_y, int dest_x, int dest_y, int width, int height);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static void pixbuf_render_pixmap_and_mask (Gdk.Pixbuf pixbuf, out weak Gdk.Pixmap pixmap_return, out weak Gdk.Bitmap mask_return, int alpha_threshold);
 	[CCode (cheader_filename = "gdk/gdk.h")]

Modified: trunk/vapi/packages/gdk-2.0/gdk-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gdk-2.0/gdk-2.0.metadata	(original)
+++ trunk/vapi/packages/gdk-2.0/gdk-2.0.metadata	Mon Jun 23 05:50:26 2008
@@ -21,6 +21,10 @@
 gdk_init.argv is_array="1" is_ref="1" array_length_pos="0.9"
 gdk_init_check.argc hidden="1"
 gdk_init_check.argv is_array="1" is_ref="1" array_length_pos="0.9"
+gdk_pixbuf_get_from_drawable.dest nullable="1"
+gdk_pixbuf_get_from_drawable.cmap nullable="1"
+gdk_pixbuf_get_from_image.dest nullable="1"
+gdk_pixbuf_get_from_image.cmap nullable="1"
 GdkPixmapObject hidden="1"
 GdkPixmapObjectClass hidden="1"
 gdk_property_get.actual_property_type is_out="1"