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 --- src/channel-main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/channel-main.c b/src/channel-main.c index 2c9a6fb..190a366 100644 --- a/src/channel-main.c +++ b/src/channel-main.c @@ -1882,23 +1882,23 @@ 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); if (spice_util_get_debug()) - spice_file_transfer_task_debug_info(self); + spice_file_transfer_task_debug_info(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(SpiceFileTransferTask *xfer_task, gchar *buffer, int data_size) -- 2.7.4 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/spice-devel