[Telepathy-commits] [telepathy-gabble/master] Revert "Stream tubes: AcceptStreamTube: only accept UNIX sockets."

[Alban Crequy]

This reverts commit d0a66d6ff89010c0b78f2db42c7ce0fcd5e666a1.
---
 src/tube-stream.c   |    4 +++-
 src/tubes-channel.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/tube-stream.c b/src/tube-stream.c
index e5ee71f..5becb1c 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -2054,7 +2054,9 @@ gabble_tube_stream_accept_stream_tube (GabbleSvcChannelTypeStreamTube *iface,
   GabbleTubeStreamPrivate *priv = GABBLE_TUBE_STREAM_GET_PRIVATE (self);
   GError *error = NULL;
 
-  if (address_type != TP_SOCKET_ADDRESS_TYPE_UNIX)
+  if (address_type != TP_SOCKET_ADDRESS_TYPE_UNIX &&
+      address_type != TP_SOCKET_ADDRESS_TYPE_IPV4 &&
+      address_type != TP_SOCKET_ADDRESS_TYPE_IPV6)
     {
       error = g_error_new (TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
           "Address type %d not implemented", address_type);
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index df70a9d..9ab6e5b 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -1918,7 +1918,9 @@ gabble_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface,
       return;
     }
 
-  if (address_type != TP_SOCKET_ADDRESS_TYPE_UNIX)
+  if (address_type != TP_SOCKET_ADDRESS_TYPE_UNIX &&
+      address_type != TP_SOCKET_ADDRESS_TYPE_IPV4 &&
+      address_type != TP_SOCKET_ADDRESS_TYPE_IPV6)
     {
       error = g_error_new (TP_ERRORS, TP_ERROR_NOT_IMPLEMENTED,
           "Address type %d not implemented", address_type);
-- 
1.5.6.5