[Telepathy-commits] [telepathy-salut/master] Revert "Disable 1-1 stream tube for now as we're not happy with the protocol"

[Guillaume Desmottes]

This reverts commit a690db8c214f02e26d68a138751c8738d4ffa879.
---
 src/salut-connection.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/salut-connection.c b/src/salut-connection.c
index ea9dde0..fbd81f0 100644
--- a/src/salut-connection.c
+++ b/src/salut-connection.c
@@ -2865,19 +2865,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;
 }
-- 
1.5.6.5