summaryrefslogtreecommitdiff
path: root/telepathy-glib/stream-tube-channel.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-01 12:39:55 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-01 12:39:55 +0200
commitd7768ba706d6522ca85d21dc5ab8ddd66296c708 (patch)
treec108e6a6c1671411d738246cb290455ca01d0b43 /telepathy-glib/stream-tube-channel.c
parent9abfa7203cbf7afb093619fc9cb1b8d372e94055 (diff)
downloadtelepathy-glib-d7768ba706d6522ca85d21dc5ab8ddd66296c708.tar.gz
tp_stream_tube_channel_offer_async: store the socket_type
Diffstat (limited to 'telepathy-glib/stream-tube-channel.c')
-rw-r--r--telepathy-glib/stream-tube-channel.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index 7d071936a..fa75335f6 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -1308,7 +1308,6 @@ tp_stream_tube_channel_offer_async (TpStreamTubeChannel *self,
GAsyncReadyCallback callback,
gpointer user_data)
{
- TpSocketAddressType socket_type;
GError *error = NULL;
g_return_if_fail (TP_IS_STREAM_TUBE_CHANNEL (self));
@@ -1323,7 +1322,7 @@ tp_stream_tube_channel_offer_async (TpStreamTubeChannel *self,
self->priv->result = g_simple_async_result_new (G_OBJECT (self), callback,
user_data, tp_stream_tube_channel_offer_async);
- socket_type = determine_socket_type (self, &error);
+ self->priv->socket_type = determine_socket_type (self, &error);
if (error != NULL)
{
operation_failed (self, error);
@@ -1337,7 +1336,7 @@ tp_stream_tube_channel_offer_async (TpStreamTubeChannel *self,
self->priv->service = g_socket_service_new ();
- switch (socket_type)
+ switch (self->priv->socket_type)
{
#ifdef HAVE_GIO_UNIX
case TP_SOCKET_ADDRESS_TYPE_UNIX:
@@ -1365,7 +1364,7 @@ tp_stream_tube_channel_offer_async (TpStreamTubeChannel *self,
GSocketAddress *in_address;
localhost = g_inet_address_new_loopback (
- socket_type == TP_SOCKET_ADDRESS_TYPE_IPV4 ?
+ self->priv->socket_type == TP_SOCKET_ADDRESS_TYPE_IPV4 ?
G_SOCKET_FAMILY_IPV4 : G_SOCKET_FAMILY_IPV6);
in_address = g_inet_socket_address_new (localhost, 0);