[Telepathy-commits] [telepathy-gabble/master] Tube access control: fix again the error message according to what it does

[Alban Crequy]

---
 src/tube-stream.c   |    7 +++----
 src/tubes-channel.c |    7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/tube-stream.c b/src/tube-stream.c
index 89ff857..0995e45 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -2082,12 +2082,11 @@ gabble_tube_stream_accept_stream_tube (GabbleSvcChannelTypeStreamTube *iface,
       return;
     }
 
-  if (address_type != TP_SOCKET_ADDRESS_TYPE_UNIX &&
-      access_control != TP_SOCKET_ACCESS_CONTROL_LOCALHOST)
+  if (access_control != TP_SOCKET_ACCESS_CONTROL_LOCALHOST)
     {
       GError e = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
-          "Only the Localhost access control method is supported for Unix"
-            "sockets" };
+          "Only the Localhost access control method is implemented"
+            " by Gabble" };
 
       dbus_g_method_return_error (context, &e);
       return;
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 56d5392..44e00e0 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -1929,12 +1929,11 @@ gabble_tubes_channel_accept_stream_tube (TpSvcChannelTypeTubes *iface,
       return;
     }
 
-  if (address_type != TP_SOCKET_ADDRESS_TYPE_UNIX &&
-      access_control != TP_SOCKET_ACCESS_CONTROL_LOCALHOST)
+  if (access_control != TP_SOCKET_ACCESS_CONTROL_LOCALHOST)
     {
       GError e = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
-          "Only the Localhost access control method is supported for Unix"
-            " sockets" };
+          "Only the Localhost access control method is implemented by"
+            " Gabble" };
 
       dbus_g_method_return_error (context, &e);
       return;
-- 
1.5.6.5