[gedit] Do not use async operations with the doc stream in the saver.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 5d09f8acb8176b400e22212e54c927e601e04746
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Feb 8 23:08:31 2010 +0100

    Do not use async operations with the doc stream in the saver.

 gedit/gedit-gio-document-saver.c |   38 ++++++++++----------------------------
 1 files changed, 10 insertions(+), 28 deletions(-)
---
diff --git a/gedit/gedit-gio-document-saver.c b/gedit/gedit-gio-document-saver.c
index b392121..0cff7cf 100644
--- a/gedit/gedit-gio-document-saver.c
+++ b/gedit/gedit-gio-document-saver.c
@@ -375,23 +375,22 @@ write_file_chunk (AsyncData *async)
 }
 
 static void
-async_read_cb (GInputStream *stream,
-	       GAsyncResult *res,
-	       AsyncData    *async)
+read_file_chunk (AsyncData *async)
 {
 	GeditGioDocumentSaver *gvsaver;
 	GeditDocumentInputStream *dstream;
 	GError *error = NULL;
 
-	if (g_cancellable_is_cancelled (async->cancellable))
-	{
-		async_data_free (async);
-		return;
-	}
-
 	gvsaver = async->saver;
+	async->written = 0;
 
-	async->read = g_input_stream_read_finish (stream, res, &error);
+	/* we use sync methods on doc stream since it is in memory. Using async
+	   would be racy and we can endup with invalidated iters */
+	async->read = g_input_stream_read (gvsaver->priv->input,
+					   async->buffer,
+					   WRITE_CHUNK_SIZE,
+					   async->cancellable,
+					   &error);
 
 	if (error != NULL)
 	{
@@ -407,30 +406,13 @@ async_read_cb (GInputStream *stream,
 	}
 
 	/* Get how many chars have been read */
-	dstream = GEDIT_DOCUMENT_INPUT_STREAM (stream);
+	dstream = GEDIT_DOCUMENT_INPUT_STREAM (gvsaver->priv->input);
 	gvsaver->priv->bytes_written = gedit_document_input_stream_tell (dstream);
 
 	write_file_chunk (async);
 }
 
 static void
-read_file_chunk (AsyncData *async)
-{
-	GeditGioDocumentSaver *gvsaver;
-
-	gvsaver = async->saver;
-	async->written = 0;
-
-	g_input_stream_read_async (gvsaver->priv->input,
-				   async->buffer,
-				   WRITE_CHUNK_SIZE,
-				   G_PRIORITY_HIGH,
-				   async->cancellable,
-				   (GAsyncReadyCallback) async_read_cb,
-				   async);
-}
-
-static void
 async_replace_ready_callback (GFile        *source,
 			      GAsyncResult *res,
 			      AsyncData    *async)