On Fri, Mar 29, 2013 at 12:40:18PM +0100, Hans de Goede wrote:
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> gtk/channel-main.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/gtk/channel-main.c b/gtk/channel-main.c
> index 4e766d3..672fbcf 100644
> --- a/gtk/channel-main.c
> +++ b/gtk/channel-main.c
> @@ -327,22 +327,34 @@ static void spice_channel_iterate_write(SpiceChannel *channel)
> }
>
> /* main or coroutine context */
> -static void spice_main_channel_reset(SpiceChannel *channel, gboolean migrating)
> +static void spice_main_channel_reset_agent(SpiceMainChannel *channel)
> {
> - SpiceMainChannelPrivate *c = SPICE_MAIN_CHANNEL(channel)->priv;
> + SpiceMainChannelPrivate *c = channel->priv;
>
> c->agent_connected = FALSE;
> c->agent_caps_received = FALSE;
> c->agent_display_config_sent = FALSE;
> - c->agent_tokens = 0;
> c->agent_msg_pos = 0;
> g_free(c->agent_msg_data);
> c->agent_msg_data = NULL;
> c->agent_msg_size = 0;
> +}
> +
> +/* main or coroutine context */
> +static void spice_main_channel_reset(SpiceChannel *channel, gboolean migrating)
> +{
> + SpiceMainChannelPrivate *c = SPICE_MAIN_CHANNEL(channel)->priv;
>
> + /* This is not part of reset_agent, since the spice-server expects any
> + pending multi-chunk messages to be completed by the client, even after
> + it has send an agent-disconnected msg as that is what the original
s/send/sent/
ACK.
Christophe
Attachment:
pgpzbowalwKUn.pgp
Description: PGP signature
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel