pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-29 17:07:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

red-channel-client: Change initialization order

Browse Source 
Make the order of initialization closer to what it was before
conversion to GObject.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Frediano Ziglio 2016-10-27 13:25:40 +01:00
parent bac3a682c8
commit 654dfa4ca5
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/red-channel-client.c
View File

@ -896,7 +896,22 @@ static gboolean red_channel_client_initable_init(GInitable *initable,
goto cleanup;
}
if (!red_channel_config_socket(self->priv->channel, self)) {
g_set_error_literal(&local_error,
SPICE_SERVER_ERROR,
SPICE_SERVER_ERROR_FAILED,
"Unable to configure socket");
goto cleanup;
}
core = red_channel_get_core_interface(self->priv->channel);
if (self->priv->stream)
self->priv->stream->watch =
core->watch_add(core, self->priv->stream->socket,
SPICE_WATCH_EVENT_READ,
red_channel_client_event,
self);
if (self->priv->monitor_latency
&& reds_stream_get_family(self->priv->stream) != AF_UNIX) {
self->priv->latency_monitor.timer =
@ -909,22 +924,9 @@ static gboolean red_channel_client_initable_init(GInitable *initable,
self->priv->latency_monitor.roundtrip = -1;
}
if (self->priv->stream)
self->priv->stream->watch =
core->watch_add(core, self->priv->stream->socket,
SPICE_WATCH_EVENT_READ,
red_channel_client_event,
self);
red_channel_add_client(self->priv->channel, self);
red_client_add_channel(self->priv->client, self);
if (!red_channel_config_socket(self->priv->channel, self)) {
g_set_error_literal(&local_error,
SPICE_SERVER_ERROR,
SPICE_SERVER_ERROR_FAILED,
"Unable to configure socket");
}
cleanup:
pthread_mutex_unlock(&self->priv->client->lock);
if (local_error) {