[telepathy-salut/master] add Localhost to SupportedAccessesControl

[Guillaume Desmottes]

---
 src/tube-dbus.c                                 |    2 ++
 tests/twisted/avahi/tubes/two-muc-dbus-tubes.py |    6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index ec8d5a1..9862b44 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -982,6 +982,8 @@ salut_tube_dbus_constructor (GType type,
       sizeof (guint), 1);
   access_control = TP_SOCKET_ACCESS_CONTROL_CREDENTIALS;
   g_array_append_val (priv->supported_access_controls, access_control);
+  access_control = TP_SOCKET_ACCESS_CONTROL_LOCALHOST;
+  g_array_append_val (priv->supported_access_controls, access_control);
 
   return obj;
 }
diff --git a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py
index bb0a320..a87a4cb 100644
--- a/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py
+++ b/tests/twisted/avahi/tubes/two-muc-dbus-tubes.py
@@ -90,7 +90,8 @@ def test(q, bus, conn):
             assert props[cs.INTERFACES] == [cs.CHANNEL_IFACE_GROUP,
                 cs.CHANNEL_IFACE_TUBE]
             assert props[cs.DBUS_TUBE_SERVICE_NAME] == 'com.example.TestCase'
-            assert props[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [cs.SOCKET_ACCESS_CONTROL_CREDENTIALS]
+            assert props[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [
+                cs.SOCKET_ACCESS_CONTROL_CREDENTIALS, cs.SOCKET_ACCESS_CONTROL_LOCALHOST]
 
             contact1_tube = bus.get_object(conn.bus_name, path)
             contact1_dbus_tube = make_channel_proxy(conn, path,
@@ -156,7 +157,8 @@ def test(q, bus, conn):
                 cs.CHANNEL_IFACE_TUBE]
             assert props[cs.TUBE_PARAMETERS] == sample_parameters
             assert props[cs.DBUS_TUBE_SERVICE_NAME] == 'com.example.TestCase'
-            assert props[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [cs.SOCKET_ACCESS_CONTROL_CREDENTIALS]
+            assert props[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [
+                cs.SOCKET_ACCESS_CONTROL_CREDENTIALS, cs.SOCKET_ACCESS_CONTROL_LOCALHOST]
 
             contact2_tube = bus.get_object(conn.bus_name, path)
             contact2_dbus_tube = make_channel_proxy(conn, path,
-- 
1.5.6.5