Actually return -1 in case of cancelled, not old res value.

2008-10-09  Alexander Larsson  <alexl@redhat.com>

	* gunixinputstream.c (g_unix_input_stream_read):
	Actually return -1 in case of cancelled, not old res value.

svn path=/trunk/; revision=7583

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 9571c8f..213cc92 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-09  Alexander Larsson  <alexl@redhat.com>
+
+       * gunixinputstream.c (g_unix_input_stream_read):
+       Actually return -1 in case of cancelled, not old res value.
+
 2008-10-06  Colin Walters  <walters@verbum.org>
 
        Bug 554745 - GFileAttributeInfoList should be boxed

diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index 155b9e6..da9c8f4 100644 (file)
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.c
@@ -201,7 +201,7 @@ g_unix_input_stream_read (GInputStream  *stream,
   while (1)
     {
       if (g_cancellable_set_error_if_cancelled (cancellable, error))
-       break;
+       return -1;
       res = read (unix_stream->priv->fd, buffer, count);
       if (res == -1)
        {