[telepathy-salut/master] Revert "disable 1-1 stream tubes"

[Guillaume Desmottes]

This reverts commit 2e03ee2ad64327a5427e3e299e9fc77fe45b4c40.
---
 src/salut-connection.c                             |    4 ----
 tests/twisted/avahi/test-caps-tubes.py             |    4 ----
 .../avahi/test-offer-private-stream-tube.py        |    4 ----
 tests/twisted/avahi/test-tube-close.py             |    7 +++----
 .../twisted/avahi/test-two-private-stream-tubes.py |    4 ----
 tests/twisted/avahi/tubes-to-nonexistant-ids.py    |    4 ----
 6 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/salut-connection.c b/src/salut-connection.c
index 6ff27a2..cccaacc 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -3213,19 +3213,15 @@ salut_connection_create_channel_managers (TpBaseConnection *base)
   priv->roomlist_manager = salut_discovery_client_create_roomlist_manager (
       priv->discovery_client, self, priv->xmpp_connection_manager);
 
-#if 0
   priv->tubes_manager = salut_tubes_manager_new (self, priv->contact_manager,
       priv->xmpp_connection_manager);
-#endif
 
   g_ptr_array_add (managers, priv->im_manager);
   g_ptr_array_add (managers, priv->contact_manager);
   g_ptr_array_add (managers, priv->ft_manager);
   g_ptr_array_add (managers, priv->muc_manager);
   g_ptr_array_add (managers, priv->roomlist_manager);
-#if 0
   g_ptr_array_add (managers, priv->tubes_manager);
-#endif
 
   return managers;
 }
diff --git a/tests/twisted/avahi/test-caps-tubes.py b/tests/twisted/avahi/test-caps-tubes.py
index 68273fe..693dc31 100644
--- a/tests/twisted/avahi/test-caps-tubes.py
+++ b/tests/twisted/avahi/test-caps-tubes.py
@@ -49,10 +49,6 @@ from constants import *
 from caps_helper import compute_caps_hash, check_caps
 from config import PACKAGE_STRING
 
-print "FIXME: test-caps-tubes.py disabled because 1-1 tubes are disabled for now"
-# exiting 77 causes automake to consider the test to have been skipped
-raise SystemExit(77)
-
 text_fixed_properties = dbus.Dictionary({
     'org.freedesktop.Telepathy.Channel.TargetHandleType': 1L,
     'org.freedesktop.Telepathy.Channel.ChannelType':
diff --git a/tests/twisted/avahi/test-offer-private-stream-tube.py b/tests/twisted/avahi/test-offer-private-stream-tube.py
index 20f72f1..fd531b6 100644
--- a/tests/twisted/avahi/test-offer-private-stream-tube.py
+++ b/tests/twisted/avahi/test-offer-private-stream-tube.py
@@ -37,10 +37,6 @@ sample_parameters = dbus.Dictionary({
 
 test_string = "This string travels on a tube !"
 
-print "FIXME: test-offer-private-stream-tube.py disabled because 1-1 tubes are disabled for now"
-# exiting 77 causes automake to consider the test to have been skipped
-raise SystemExit(77)
-
 def check_conn_properties(q, bus, conn, channel_list=None):
     properties = conn.GetAll(
             'org.freedesktop.Telepathy.Connection.Interface.Requests',
diff --git a/tests/twisted/avahi/test-tube-close.py b/tests/twisted/avahi/test-tube-close.py
index 9c190bd..fe5bda7 100644
--- a/tests/twisted/avahi/test-tube-close.py
+++ b/tests/twisted/avahi/test-tube-close.py
@@ -23,10 +23,9 @@ HT_CONTACT_LIST = 3
 SOCKET_ADDRESS_TYPE_IPV4 = dbus.UInt32(2)
 SOCKET_ACCESS_CONTROL_LOCALHOST = dbus.UInt32(0)
 
-#print "FIXME: test-tube-close.py disabled because sending a close stanza on "
-#print "disconnection is not yet implemented in telepathy-salut. It requires "
-#print "to ensure the XmppConnection and reestablish it"
-print "FIXME: test-tube-close.py disabled because 1-1 tubes are disabled for now"
+print "FIXME: test-tube-close.py disabled because sending a close stanza on "
+print "disconnection is not yet implemented in telepathy-salut. It requires "
+print "to ensure the XmppConnection and reestablish it"
 # exiting 77 causes automake to consider the test to have been skipped
 raise SystemExit(77)
 
diff --git a/tests/twisted/avahi/test-two-private-stream-tubes.py b/tests/twisted/avahi/test-two-private-stream-tubes.py
index 6421ff0..322cbac 100644
--- a/tests/twisted/avahi/test-two-private-stream-tubes.py
+++ b/tests/twisted/avahi/test-two-private-stream-tubes.py
@@ -26,10 +26,6 @@ test_string = "This string travels on a tube !"
 
 SERVER_WELCOME_MSG = "Welcome!"
 
-print "FIXME: test-two-private-stream-tubes.py disabled because 1-1 tubes are disabled for now"
-# exiting 77 causes automake to consider the test to have been skipped
-raise SystemExit(77)
-
 def test(q, bus, conn):
 
     # define a basic tcp server that echoes what the client says, but with
diff --git a/tests/twisted/avahi/tubes-to-nonexistant-ids.py b/tests/twisted/avahi/tubes-to-nonexistant-ids.py
index b4da97f..409c02c 100644
--- a/tests/twisted/avahi/tubes-to-nonexistant-ids.py
+++ b/tests/twisted/avahi/tubes-to-nonexistant-ids.py
@@ -16,10 +16,6 @@ import dbus
 
 arbitrary_ids = [ "DooN4Bei at TheeK6bo-Tegh4aci", "ahrui1iM at Dai6igho-ADetaes3" ]
 
-print "FIXME: test-to-nonexistant-ids.py disabled because 1-1 tubes are disabled for now"
-# exiting 77 causes automake to consider the test to have been skipped
-raise SystemExit(77)
-
 def test(q, bus, conn):
     conn.Connect()
     q.expect('dbus-signal', signal='StatusChanged', args=[0L, 0L])
-- 
1.5.6.5