[Telepathy-commits] [telepathy-gabble/master] private tubes: include StreamTube.Service and Tube.Parameters in allowed

[Will Thompson]

---
 src/private-tubes-factory.c          |    2 ++
 tests/twisted/tubes/test-si-tubes.py |   14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index b9ed5b2..033f320 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -1000,6 +1000,8 @@ static const gchar * const tubes_channel_fixed_properties[] = {
 
 static const gchar * const tubes_channel_allowed_properties[] = {
     TP_IFACE_CHANNEL ".TargetHandle",
+    GABBLE_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service",
+    GABBLE_IFACE_CHANNEL_INTERFACE_TUBE ".Parameters",
     NULL
 };
 
diff --git a/tests/twisted/tubes/test-si-tubes.py b/tests/twisted/tubes/test-si-tubes.py
index 1d442e2..1607aae 100644
--- a/tests/twisted/tubes/test-si-tubes.py
+++ b/tests/twisted/tubes/test-si-tubes.py
@@ -67,15 +67,21 @@ def test(q, bus, conn, stream):
                 'org.freedesktop.Telepathy.Channel.Type.Tubes',
              'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
              },
-             ['org.freedesktop.Telepathy.Channel.TargetHandle'],
-             ) in properties.get('RequestableChannelClasses'),\
+             ['org.freedesktop.Telepathy.Channel.TargetHandle',
+              'org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT.Service',
+              'org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT.Parameters',
+             ]
+            ) in properties.get('RequestableChannelClasses'),\
                      properties['RequestableChannelClasses']
     assert ({'org.freedesktop.Telepathy.Channel.ChannelType':
                 'org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT',
              'org.freedesktop.Telepathy.Channel.TargetHandleType': 1,
              },
-             ['org.freedesktop.Telepathy.Channel.TargetHandle'],
-             ) in properties.get('RequestableChannelClasses'),\
+             ['org.freedesktop.Telepathy.Channel.TargetHandle',
+              'org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT.Service',
+              'org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT.Parameters',
+             ]
+            ) in properties.get('RequestableChannelClasses'),\
                      properties['RequestableChannelClasses']
 
     _, vcard_event, roster_event = q.expect_many(
-- 
1.5.6.5