[Spice-devel] [spice-gtk v5 08/23] main: do not check for xfer-task errors

[Jonathon Jongsma]

Acked-by: Jonathon Jongsma <jjongsma at redhat.com>


On Tue, 2016-07-05 at 15:07 +0200, Victor Toso wrote:
> The errors related to SpiceFileTransferTask can be present:
> * before the flush happens, on spice_file_transfer_task_read_async()
> * during the async flush:
>   - cancel from user which is handled by file_xfer_flush_async
>   - cancel/error from agent, handled on main_agent_handle_xfer_status()
> 
> file_xfer_flush_finish() should not check internal errors of
> SpiceFileTransferTask and only be worried about errors regarding the
> flush itself.
> 
> Note that with or without this patch, in case of errors from agent, we
> don't stop the flushing; it is only cancelled from user cancellation.
> ---
>  src/channel-main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/channel-main.c b/src/channel-main.c
> index 209e08d..d071f42 100644
> --- a/src/channel-main.c
> +++ b/src/channel-main.c
> @@ -1892,7 +1892,7 @@ static void file_xfer_data_flushed_cb(GObject
> *source_object,
>      GError *error = NULL;
>  
>      file_xfer_flush_finish(channel, res, &error);
> -    if (error || self->error) {
> +    if (error) {
>          spice_file_transfer_task_completed(self, error);
>          return;
>      }