Avoid getting channel from client

Acked-by: Christophe Fergeau <cfergeau@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-05-13 10:48:43 +01:00
parent 5841a2abda
commit 5d2fb6a897
3 changed files with 1 additions and 9 deletions

View File

@ -54,9 +54,7 @@ void inputs_channel_client_send_migrate_data(RedChannelClient *rcc,
RedPipeItem *item)
{
InputsChannelClient *icc = SPICE_CONTAINEROF(rcc, InputsChannelClient, base);
InputsChannel *inputs = (InputsChannel*)rcc->channel;
inputs_channel_set_src_during_migrate(inputs, FALSE);
red_channel_client_init_send_data(rcc, SPICE_MSG_MIGRATE_DATA, item);
spice_marshaller_add_uint32(m, SPICE_MIGRATE_DATA_INPUTS_MAGIC);

View File

@ -261,6 +261,7 @@ static void inputs_channel_send_item(RedChannelClient *rcc, RedPipeItem *base)
red_channel_client_init_send_data(rcc, SPICE_MSG_INPUTS_MOUSE_MOTION_ACK, base);
break;
case RED_PIPE_ITEM_MIGRATE_DATA:
((InputsChannel*)rcc->channel)->src_during_migrate = FALSE;
inputs_channel_client_send_migrate_data(rcc, m, base);
break;
default:
@ -673,9 +674,3 @@ gboolean inputs_channel_is_src_during_migrate(InputsChannel *inputs)
{
return inputs->src_during_migrate;
}
void inputs_channel_set_src_during_migrate(InputsChannel *inputs,
gboolean value)
{
inputs->src_during_migrate = value;
}

View File

@ -41,6 +41,5 @@ void inputs_channel_detach_tablet(InputsChannel *inputs, SpiceTabletInstance *ta
RedsState* spice_tablet_state_get_server(SpiceTabletState *dev);
RedsState* spice_kbd_state_get_server(SpiceKbdState *dev);
gboolean inputs_channel_is_src_during_migrate(InputsChannel *inputs);
void inputs_channel_set_src_during_migrate(InputsChannel *inputs, gboolean value);
#endif