[Telepathy-commits] [telepathy-salut/master] Disable requesting new-style DBus tubes.

[Will Thompson]

(They're not actually implemented.)
---
 src/salut-tubes-channel.c                          |    3 +++
 src/salut-tubes-manager.c                          |   14 ++++++++++++--
 .../avahi/test-request-invalid-dbus-tube.py        |    5 +++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 619f18d..2c659b7 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -1006,12 +1006,15 @@ salut_tubes_channel_tube_request (SalutTubesChannel *self,
                 SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service");
 
     }
+/* Temporarily disabled since the implementation is incomplete */
+#if 0
   else if (!tp_strdiff (channel_type, SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE))
     {
       type = TP_TUBE_TYPE_DBUS;
       service = tp_asv_get_string (request_properties,
                 SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName");
     }
+#endif
   else
     g_assert_not_reached ();
 
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index 5ea4d66..0be7cd3 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -718,12 +718,15 @@ static const gchar * const stream_tube_channel_allowed_properties[] = {
     SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE ".Service",
     NULL
 };
+/* Temporarily disabled since the implementation is incomplete. */
+#if 0
 static const gchar * const dbus_tube_channel_allowed_properties[] = {
     TP_IFACE_CHANNEL ".TargetHandle",
     SALUT_IFACE_CHANNEL_INTERFACE_TUBE ".Parameters",
     SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE ".ServiceName",
     NULL
 };
+#endif
 
 static void
 salut_tubes_manager_foreach_channel_class (
@@ -771,6 +774,8 @@ salut_tubes_manager_foreach_channel_class (
   g_hash_table_destroy (table);
 
   /* 1-1 Channel.Type.DBusTube */
+  /* Temporarily disabled since the implementation is incomplete. */
+#if 0
   table = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
       (GDestroyNotify) tp_g_value_slice_free);
 
@@ -787,6 +792,7 @@ salut_tubes_manager_foreach_channel_class (
   func (manager, table, dbus_tube_channel_allowed_properties, user_data);
 
   g_hash_table_destroy (table);
+#endif
 }
 
 static gboolean
@@ -813,8 +819,9 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
             TP_IFACE_CHANNEL ".ChannelType");
 
   if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TUBES) &&
-      tp_strdiff (channel_type, SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE) &&
-      tp_strdiff (channel_type, SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE))
+  /* Temporarily disabled since the implementation is incomplete. */
+  /*  tp_strdiff (channel_type, SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE) && */
+      tp_strdiff (channel_type, SALUT_IFACE_CHANNEL_TYPE_STREAM_TUBE))
     return FALSE;
 
   if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TUBES))
@@ -846,6 +853,8 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
           goto error;
         }
     }
+/* Temporarily disabled since the implementation is incomplete. */
+#if 0
   else if (!tp_strdiff (channel_type, SALUT_IFACE_CHANNEL_TYPE_DBUS_TUBE))
     {
       const gchar *service;
@@ -877,6 +886,7 @@ salut_tubes_manager_requestotron (SalutTubesManager *self,
           goto error;
         }
     }
+#endif
 
   handle = tp_asv_get_uint32 (request_properties,
       TP_IFACE_CHANNEL ".TargetHandle", NULL);
diff --git a/tests/twisted/avahi/test-request-invalid-dbus-tube.py b/tests/twisted/avahi/test-request-invalid-dbus-tube.py
index d940b62..234c0d9 100644
--- a/tests/twisted/avahi/test-request-invalid-dbus-tube.py
+++ b/tests/twisted/avahi/test-request-invalid-dbus-tube.py
@@ -15,6 +15,11 @@ from twisted.words.xish import xpath, domish
 from twisted.internet.protocol import Factory, Protocol, ClientCreator
 from twisted.internet import reactor
 
+print "FIXME: test-request-invalid-dbus-tube.py disabled because the new API"
+print "       for DBus tubes is not implemented."
+# exiting 77 causes automake to consider the test to have been skipped
+raise SystemExit(77)
+
 PUBLISHED_NAME="test-tube"
 
 CHANNEL_TYPE_TUBES = "org.freedesktop.Telepathy.Channel.Type.Tubes"
-- 
1.5.6.5