Merge from 2.16 branch:

2008-12-21  Paul Pogonyshev  <pogonyshev@gmx.net>

	Bug 564102 – _wrap_g_output_stream_write_async not adding a
	reference to the buffer passed

	* gio/gio.override (pygio_notify_copy_buffer): New function.
	(pygio_free_notify): Free new `buffer' field if it is set.

	* gio/goutputstream.override (_wrap_g_output_stream_write_async):
	Copy the buffer with new pygio_notify_copy_buffer() and use the
	copy for g_output_stream_write_async() call.

	* gio/gfile.override (_wrap_g_file_replace_contents_async): Same
	as for _wrap_g_output_stream_write_async().

svn path=/trunk/; revision=981

1 files changed, 14 insertions, 0 deletions

diff --git a/gio/gio.override b/gio/gio.override
index e6916a0..0f6ae5f 100644
--- a/gio/gio.override
+++ b/gio/gio.override
@@ -36,6 +36,8 @@ headers
 typedef struct {
     PyObject *callback;
     PyObject *data;
+    gpointer  buffer;
+    gsize     buffer_size;
 } PyGIONotify;
 
 static void
@@ -45,10 +47,22 @@ py_decref_callback (gpointer data)
 }
 
 static void
+pygio_notify_copy_buffer(PyGIONotify *notify, gpointer buffer, gsize buffer_size)
+{
+    if (buffer_size > 0) {
+	notify->buffer = g_slice_copy(buffer_size, buffer);
+	notify->buffer_size = buffer_size;
+    }
+}
+
+static void
 pygio_free_notify(PyGIONotify *notify)
 {
     Py_XDECREF(notify->callback);
     Py_XDECREF(notify->data);
+    if (notify->buffer)
+	g_slice_free1(notify->buffer_size, notify->buffer);
+
     g_slice_free(PyGIONotify, notify);
 }