[telepathy-gabble/master] add LocalHost to SupportedAccessControls

[Guillaume Desmottes]

---
 src/tube-dbus.c                                 |    2 ++
 tests/twisted/tubes/accept-muc-dbus-tube.py     |    3 ++-
 tests/twisted/tubes/accept-private-dbus-tube.py |    3 ++-
 tests/twisted/tubes/offer-muc-dbus-tube.py      |    3 ++-
 tests/twisted/tubes/offer-private-dbus-tube.py  |    3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 843d4dc..3a5357d 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -956,6 +956,8 @@ gabble_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/tubes/accept-muc-dbus-tube.py b/tests/twisted/tubes/accept-muc-dbus-tube.py
index e437a30..53b636a 100644
--- a/tests/twisted/tubes/accept-muc-dbus-tube.py
+++ b/tests/twisted/tubes/accept-muc-dbus-tube.py
@@ -59,7 +59,8 @@ def test(q, bus, conn, stream, access_control):
     assert props[c.TARGET_ID] == 'chat at conf.localhost'
     assert props[c.DBUS_TUBE_SERVICE_NAME] == 'com.example.Test'
     assert props[c.TUBE_PARAMETERS] == {'foo': 'bar'}
-    assert props[c.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [c.SOCKET_ACCESS_CONTROL_CREDENTIALS]
+    assert props[c.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [c.SOCKET_ACCESS_CONTROL_CREDENTIALS,
+        c.SOCKET_ACCESS_CONTROL_LOCALHOST]
 
     tube_chan = bus.get_object(conn.bus_name, path)
     tube_iface = dbus.Interface(tube_chan, c.CHANNEL_IFACE_TUBE)
diff --git a/tests/twisted/tubes/accept-private-dbus-tube.py b/tests/twisted/tubes/accept-private-dbus-tube.py
index 280b8ea..1c2913f 100644
--- a/tests/twisted/tubes/accept-private-dbus-tube.py
+++ b/tests/twisted/tubes/accept-private-dbus-tube.py
@@ -150,7 +150,8 @@ def test(q, bus, conn, stream, bytestream_cls, access_control):
     assert props[cs.TARGET_ID] == 'bob at localhost'
     assert props[cs.DBUS_TUBE_SERVICE_NAME] == 'com.example.TestCase2'
     assert props[cs.TUBE_PARAMETERS] == {'login': 'TEST'}
-    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]
     assert cs.TUBE_STATE not in props
 
     tube_chan = bus.get_object(conn.bus_name, path)
diff --git a/tests/twisted/tubes/offer-muc-dbus-tube.py b/tests/twisted/tubes/offer-muc-dbus-tube.py
index 81ad300..abac1f3 100644
--- a/tests/twisted/tubes/offer-muc-dbus-tube.py
+++ b/tests/twisted/tubes/offer-muc-dbus-tube.py
@@ -230,7 +230,8 @@ def test(q, bus, conn, stream, access_control):
     assert prop[cs.TARGET_HANDLE_TYPE] == cs.HT_ROOM
     assert prop[cs.TARGET_ID] == 'chat2 at conf.localhost'
     assert prop[cs.DBUS_TUBE_SERVICE_NAME] == 'com.example.TestCase'
-    assert prop[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [cs.SOCKET_ACCESS_CONTROL_CREDENTIALS]
+    assert prop[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [cs.SOCKET_ACCESS_CONTROL_CREDENTIALS,
+        cs.SOCKET_ACCESS_CONTROL_LOCALHOST]
 
     # check that the tube channel is in the channels list
     all_channels = conn.Get(cs.CONN_IFACE_REQUESTS, 'Channels',
diff --git a/tests/twisted/tubes/offer-private-dbus-tube.py b/tests/twisted/tubes/offer-private-dbus-tube.py
index 7618647..32c71b5 100644
--- a/tests/twisted/tubes/offer-private-dbus-tube.py
+++ b/tests/twisted/tubes/offer-private-dbus-tube.py
@@ -190,7 +190,8 @@ def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle,
     assert tube_props[cs.INITIATOR_HANDLE] == self_handle
     assert tube_props[cs.INITIATOR_ID] == "test at localhost"
     assert tube_props[cs.DBUS_TUBE_SERVICE_NAME] == 'com.example.TestCase'
-    assert tube_props[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [cs.SOCKET_ACCESS_CONTROL_CREDENTIALS]
+    assert tube_props[cs.DBUS_TUBE_SUPPORTED_ACCESS_CONTROLS] == [cs.SOCKET_ACCESS_CONTROL_CREDENTIALS,
+        cs.SOCKET_ACCESS_CONTROL_LOCALHOST]
     assert cs.DBUS_TUBE_DBUS_NAMES not in tube_props
     assert cs.TUBE_PARAMETERS not in tube_props
     assert cs.TUBE_STATE not in tube_props
-- 
1.5.6.5