CamelStreamFs: Check for cancellation before closing or flushing
authorMatthew Barnes <mbarnes@redhat.com>
Mon, 10 Jan 2011 22:42:24 +0000 (17:42 -0500)
committerMatthew Barnes <mbarnes@redhat.com>
Mon, 10 Jan 2011 22:46:06 +0000 (17:46 -0500)
camel/camel-stream-fs.c

index 1c577c7..23eebea 100644 (file)
@@ -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,