glib r7827 - trunk/gio

[ryanl svn gnome org]

Author: ryanl
Date: Thu Jan 22 19:00:05 2009
New Revision: 7827
URL: http://svn.gnome.org/viewvc/glib?rev=7827&view=rev

Log:
2009-01-22  Ryan Lortie  <desrt desrt ca>

        Bug 568741 â g_buffered_input_stream_fill_async doesn't work

        * gbufferedinputstream.c (fill_async_callback): grow the buffer tail
        after we have successfully read data from the base stream



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gbufferedinputstream.c

Modified: trunk/gio/gbufferedinputstream.c
==============================================================================
--- trunk/gio/gbufferedinputstream.c	(original)
+++ trunk/gio/gbufferedinputstream.c	Thu Jan 22 19:00:05 2009
@@ -931,6 +931,19 @@
       g_simple_async_result_set_from_error (simple, error);
       g_error_free (error);
     }
+  else
+    {
+      GBufferedInputStreamPrivate *priv;
+      GObject *object;
+
+      object = g_async_result_get_source_object (G_ASYNC_RESULT (simple));
+      priv = G_BUFFERED_INPUT_STREAM (object)->priv;
+
+      g_assert_cmpint (priv->end + res, <=, priv->len);
+      priv->end += res;
+
+      g_object_unref (object);
+    }
   
   /* Complete immediately, not in idle, since we're already in a mainloop callout */
   g_simple_async_result_complete (simple);