diff options
Diffstat (limited to 'gtk/channel-inputs.c')
| -rw-r--r-- | gtk/channel-inputs.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/channel-inputs.c b/gtk/channel-inputs.c index c5c363f..443a39d 100644 --- a/gtk/channel-inputs.c +++ b/gtk/channel-inputs.c @@ -1,7 +1,6 @@ #include <assert.h> #include "spice-client.h" -#include "spice-channel-priv.h" #define SPICE_INPUTS_CHANNEL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), SPICE_TYPE_INPUTS_CHANNEL, spice_inputs_channel)) @@ -119,9 +118,9 @@ static void inputs_handle_ack(SpiceChannel *channel, spice_msg_in *in) } static spice_msg_handler inputs_handlers[] = { - [ SPICE_MSG_SET_ACK ] = base_handle_set_ack, - [ SPICE_MSG_PING ] = base_handle_ping, - [ SPICE_MSG_NOTIFY ] = base_handle_notify, + [ SPICE_MSG_SET_ACK ] = spice_channel_handle_set_ack, + [ SPICE_MSG_PING ] = spice_channel_handle_ping, + [ SPICE_MSG_NOTIFY ] = spice_channel_handle_notify, [ SPICE_MSG_INPUTS_INIT ] = inputs_handle_init, [ SPICE_MSG_INPUTS_KEY_MODIFIERS ] = inputs_handle_modifiers, @@ -130,9 +129,10 @@ static spice_msg_handler inputs_handlers[] = { static void spice_inputs_handle_msg(SpiceChannel *channel, spice_msg_in *msg) { - assert(msg->header.type < SPICE_N_ELEMENTS(inputs_handlers)); - assert(inputs_handlers[msg->header.type] != NULL); - inputs_handlers[msg->header.type](channel, msg); + int type = spice_msg_in_type(msg); + assert(type < SPICE_N_ELEMENTS(inputs_handlers)); + assert(inputs_handlers[type] != NULL); + inputs_handlers[type](channel, msg); } void spice_inputs_motion(SpiceInputsChannel *channel, gint dx, gint dy, |