From: Jared Moore <jaredm@svn.gnome.org>
Date: Sun, 29 Jun 2008 03:29:32 +0000 (+0000)
Subject: Let 'destroy' arguments of g_memory_input_stream_add_data and
X-Git-Tag: VALA_0_3_5~94
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bcb02009737c525b26da5b764bccd823ec5bdf92;p=platform%2Fupstream%2Fvala.git

Let 'destroy' arguments of g_memory_input_stream_add_data and

2008-06-29  Jared Moore  <jaredm@svn.gnome.org>

	* vapi/packages/gio-2.0/gio-2.0.metadata:

	Let 'destroy' arguments of g_memory_input_stream_add_data and
	g_memory_input_stream_new_from_data be nullable, fixes bug 540662.

	* vapi/gio-2.0.vapi: Regenerated

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

diff --git a/ChangeLog b/ChangeLog
index 47d40fe..6c980b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-06-29  Jared Moore  <jaredm@svn.gnome.org>
+
+	* vapi/packages/gio-2.0/gio-2.0.metadata:
+
+	Let 'destroy' arguments of g_memory_input_stream_add_data and 
+	g_memory_input_stream_new_from_data be nullable, fixes bug 540662.
+
+	* vapi/gio-2.0.vapi: Regenerated
+
 2008-06-29  Jamie McCracken  <jamiemcc@gnome.org>
 
 	* vala/valagenieparser.vala:
diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi
index 6c33e1a..c8c76f5 100644
--- a/vapi/gio-2.0.vapi
+++ b/vapi/gio-2.0.vapi
@@ -493,9 +493,9 @@ namespace GLib {
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class MemoryInputStream : GLib.InputStream, GLib.Seekable {
-		public void add_data (void* data, long len, GLib.DestroyNotify destroy);
+		public void add_data (void* data, long len, GLib.DestroyNotify? destroy);
 		public MemoryInputStream ();
-		public MemoryInputStream.from_data (void* data, long len, GLib.DestroyNotify destroy);
+		public MemoryInputStream.from_data (void* data, long len, GLib.DestroyNotify? destroy);
 	}
 	[CCode (cheader_filename = "gio/gio.h")]
 	public class MemoryOutputStream : GLib.OutputStream, GLib.Seekable {
diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata
index 758a139..276bec5 100644
--- a/vapi/packages/gio-2.0/gio-2.0.metadata
+++ b/vapi/packages/gio-2.0/gio-2.0.metadata
@@ -42,6 +42,8 @@ g_file_replace_finish transfer_ownership="1"
 g_file_resolve_relative_path transfer_ownership="1"
 g_input_stream_read_all.bytes_read is_out="1"
 GIOErrorEnum rename_to="IOError" errordomain="1"
+g_memory_input_stream_add_data.destroy nullable="1"
+g_memory_input_stream_new_from_data.destroy nullable="1"
 GMountOperation::reply has_emitter="1"
 g_output_stream_write_all.bytes_written is_out="1"
 g_themed_icon_new_from_names.iconnames is_array="1"