From 827148c19a7f1208bddf73355849228c8f725db5 Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Wed, 22 Jun 2016 18:41:06 +0200 Subject: main: use xfer_task instead of task or self Another patch to rename variable and keep consistency across channel-main. Let's avoid task which is common for GTask and self for non SpiceMainChannel objects Acked-by: Jonathon Jongsma --- src/channel-main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/channel-main.c b/src/channel-main.c index 31b01a3..5f01638 100644 --- a/src/channel-main.c +++ b/src/channel-main.c @@ -1880,20 +1880,20 @@ static void file_xfer_data_flushed_cb(GObject *source_object, GAsyncResult *res, gpointer user_data) { - SpiceFileTransferTask *self = user_data; + SpiceFileTransferTask *xfer_task = user_data; SpiceMainChannel *channel = (SpiceMainChannel *)source_object; GError *error = NULL; file_xfer_flush_finish(channel, res, &error); if (error) { - spice_file_transfer_task_completed(self, error); + spice_file_transfer_task_completed(xfer_task, error); return; } - file_transfer_operation_send_progress(self); + file_transfer_operation_send_progress(xfer_task); /* Read more data */ - spice_file_transfer_task_read_async(self, file_xfer_read_async_cb, NULL); + spice_file_transfer_task_read_async(xfer_task, file_xfer_read_async_cb, NULL); } static void file_xfer_queue_msg_to_agent(SpiceMainChannel *channel, -- cgit v1.2.3