glib r7582 - branches/glib-2-18/gio

[alexl svn gnome org]

Author: alexl
Date: Thu Oct  9 10:02:45 2008
New Revision: 7582
URL: http://svn.gnome.org/viewvc/glib?rev=7582&view=rev

Log:
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.




Modified:
   branches/glib-2-18/gio/ChangeLog
   branches/glib-2-18/gio/gunixinputstream.c

Modified: branches/glib-2-18/gio/gunixinputstream.c
==============================================================================
--- branches/glib-2-18/gio/gunixinputstream.c	(original)
+++ branches/glib-2-18/gio/gunixinputstream.c	Thu Oct  9 10:02:45 2008
@@ -207,7 +207,7 @@
   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)
 	{