From: Juerg Billeter <j@bitron.ch>
Date: Sat, 10 May 2008 14:29:32 +0000 (+0000)
Subject: Fix gdk_pixbuf_new_from_data and gdk_pixbuf_save bindings, patch by Jaap
X-Git-Tag: VALA_0_3_2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa523523aeeb8a44cc52ef6c73caecd4169d30e4;p=thirdparty%2Fvala.git

Fix gdk_pixbuf_new_from_data and gdk_pixbuf_save bindings, patch by Jaap

2008-05-10  Juerg Billeter  <j@bitron.ch>

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

	Fix gdk_pixbuf_new_from_data and gdk_pixbuf_save bindings,
	patch by Jaap A. Haitsma, fixes bug 531412

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

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

diff --git a/ChangeLog b/ChangeLog
index f6f43bcab..5376ee393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-05-10  Jürg Billeter  <j@bitron.ch>
+
+	* vapi/packages/gdk-pixbuf-2.0/:
+
+	Fix gdk_pixbuf_new_from_data and gdk_pixbuf_save bindings,
+	patch by Jaap A. Haitsma, fixes bug 531412
+
+	* vapi/gdk-pixbuf-2.0.vapi: regenerated
+
 2008-05-08  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valastruct.vala:
diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi
index bec63ac66..ca515dc13 100644
--- a/vapi/gdk-pixbuf-2.0.vapi
+++ b/vapi/gdk-pixbuf-2.0.vapi
@@ -96,7 +96,7 @@ namespace Gdk {
 		public int get_rowstride ();
 		public int get_width ();
 		public Pixbuf (Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height);
-		public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify destroy_fn, void* destroy_fn_data);
+		public Pixbuf.from_data (uchar[] data, Gdk.Colorspace colorspace, bool has_alpha, int bits_per_sample, int width, int height, int rowstride, Gdk.PixbufDestroyNotify? destroy_fn);
 		public Pixbuf.from_file (string filename) throws GLib.Error;
 		public Pixbuf.from_file_at_scale (string filename, int width, int height, bool preserve_aspect_ratio) throws GLib.Error;
 		public Pixbuf.from_file_at_size (string filename, int width, int height) throws GLib.Error;
@@ -105,7 +105,7 @@ namespace Gdk {
 		public Pixbuf.subpixbuf (Gdk.Pixbuf src_pixbuf, int src_x, int src_y, int width, int height);
 		public weak Gdk.Pixbuf rotate_simple (Gdk.PixbufRotation angle);
 		public void saturate_and_pixelate (Gdk.Pixbuf dest, float saturation, bool pixelate);
-		public bool save (string filename, string type) throws GLib.Error;
+		public bool save (string filename, string type, ...) throws GLib.Error;
 		public bool save_to_buffer (string buffer, ulong buffer_size, string type) throws GLib.Error;
 		public bool save_to_bufferv (string buffer, ulong buffer_size, string type, string[] option_keys, string[] option_values) throws GLib.Error;
 		public bool save_to_callback (Gdk.PixbufSaveFunc save_func, string type) throws GLib.Error;
diff --git a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
index 8892e4b41..7b3a91009 100644
--- a/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
+++ b/vapi/packages/gdk-pixbuf-2.0/gdk-pixbuf-2.0.metadata
@@ -1,5 +1,8 @@
 Gdk cheader_filename="gdk-pixbuf/gdk-pixdata.h"
+gdk_pixbuf_new_from_data.destroy_fn nullable="1"
+gdk_pixbuf_new_from_data.destroy_fn_data hidden="1"
 gdk_pixbuf_new_from_xpm_data.data is_array="1"
+gdk_pixbuf_save ellipsis="1"
 gdk_pixbuf_save_to_bufferv.option_keys is_array="1"
 gdk_pixbuf_save_to_bufferv.option_values is_array="1"
 gdk_pixbuf_save_to_callbackv.option_keys is_array="1"