[evolution-data-server] CamelStreamFs: Check for cancellation before closing or flushing

[Matthew Barnes <mbarnes src gnome org>]

commit d03521b9168508bc796276f5fd5276bfcaa31690
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jan 10 17:42:24 2011 -0500

    CamelStreamFs: Check for cancellation before closing or flushing

 camel/camel-stream-fs.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 1c577c7..23eebea 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -124,6 +124,9 @@ stream_fs_flush (CamelStream *stream,
 
 	priv = CAMEL_STREAM_FS_GET_PRIVATE (stream);
 
+	if (g_cancellable_set_error_if_cancelled (cancellable, error))
+		return -1;
+
 	if (fsync (priv->fd) == -1) {
 		g_set_error (
 			error, G_IO_ERROR,
@@ -144,6 +147,9 @@ stream_fs_close (CamelStream *stream,
 
 	priv = CAMEL_STREAM_FS_GET_PRIVATE (stream);
 
+	if (g_cancellable_set_error_if_cancelled (cancellable, error))
+		return -1;
+
 	if (close (priv->fd) == -1) {
 		g_set_error (
 			error, G_IO_ERROR,