[Telepathy-commits] [telepathy-salut/master] Remove deprecated functions: salut_tubes_manager_handle_si_stream_request

[Alban Crequy]

We don't use SI for 1-1 tubes anymore
---
 src/salut-si-bytestream-manager.c |   20 ++------------------
 src/salut-tubes-channel.c         |    3 +--
 src/salut-tubes-manager.c         |   28 ----------------------------
 src/salut-tubes-manager.h         |    4 ----
 4 files changed, 3 insertions(+), 52 deletions(-)

diff --git a/src/salut-si-bytestream-manager.c b/src/salut-si-bytestream-manager.c
index 0cf47fe..e41a8f8 100644
--- a/src/salut-si-bytestream-manager.c
+++ b/src/salut-si-bytestream-manager.c
@@ -375,10 +375,8 @@ si_request_cb (SalutXmppConnectionManager *xcm,
       goto out;
     }
 
-  /* A Tubes SI request can be:
-   *  - a 1-1 new tube offer
-   *  - a 1-1 tube extra bytestream offer
-   *  - a muc tube extra bytestream offer
+  /* A Tubes SI request can only be a muc tube extra bytestream offer.
+   * We don't use SI for 1-1 tubes
    */
 
   if ((node = gibber_xmpp_node_get_child_ns (si, "muc-stream",
@@ -411,20 +409,6 @@ si_request_cb (SalutXmppConnectionManager *xcm,
           bytestream, room_handle, stream_id, stanza);
       g_object_unref (muc_mgr);
     }
-  else if ((node = gibber_xmpp_node_get_child_ns (si, "stream",
-          GIBBER_TELEPATHY_NS_TUBES)))
-    {
-      SalutTubesManager *tubes_mgr;
-
-      g_object_get (priv->connection, "tubes-manager", &tubes_mgr, NULL);
-      g_assert (tubes_mgr != NULL);
-
-      /* The SI request is an extra bytestream for a 1-1 tube */
-      salut_tubes_manager_handle_si_stream_request (
-          tubes_mgr, bytestream, peer_handle, stream_id, stanza);
-
-      g_object_unref (tubes_mgr);
-    }
   else
     {
       GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_BAD_REQUEST,
diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index 81bb6b0..fd515c3 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -2508,8 +2508,7 @@ salut_tubes_channel_get_interfaces (TpSvcChannel *iface,
 }
 
 /* Called when we receive a SI request,
- * via either salut_muc_manager_handle_si_stream_request or
- * salut_tubes_manager_handle_si_stream_request
+ * via salut_muc_manager_handle_si_stream_request
  */
 void
 salut_tubes_channel_bytestream_offered (SalutTubesChannel *self,
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index 45656a4..86e37ce 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -704,34 +704,6 @@ salut_tubes_manager_iface_request (TpChannelFactoryIface *iface,
   return status;
 }
 
-void salut_tubes_manager_handle_si_stream_request (SalutTubesManager *self,
-    GibberBytestreamIface *bytestream, TpHandle contact_handle,
-    const gchar *stream_id, GibberXmppStanza *msg)
-{
-  SalutTubesManagerPrivate *priv = SALUT_TUBES_MANAGER_GET_PRIVATE (self);
-  TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
-     (TpBaseConnection*) &priv->conn->parent, TP_HANDLE_TYPE_CONTACT);
-  SalutTubesChannel *chan = NULL;
-
-  g_return_if_fail (tp_handle_is_valid (contact_repo, contact_handle, NULL));
-
-#ifdef ENABLE_DBUS_TUBES
-  chan = g_hash_table_lookup (priv->channels,
-      GUINT_TO_POINTER (contact_handle));
-#endif
-  if (chan == NULL)
-    {
-      GError e = { GIBBER_XMPP_ERROR, XMPP_ERROR_BAD_REQUEST,
-          "No tubes channel available for this contact" };
-
-      DEBUG ("tubes channel doesn't exist for contact %d", contact_handle);
-      gibber_bytestream_iface_close (bytestream, &e);
-      return;
-    }
-
-  salut_tubes_channel_bytestream_offered (chan, bytestream, msg);
-}
-
 SalutTubesManager *
 salut_tubes_manager_new (
     SalutConnection *conn,
diff --git a/src/salut-tubes-manager.h b/src/salut-tubes-manager.h
index 137f164..462e213 100644
--- a/src/salut-tubes-manager.h
+++ b/src/salut-tubes-manager.h
@@ -67,10 +67,6 @@ SalutTubesManager * salut_tubes_manager_new (
     SalutContactManager *contact_manager,
     SalutXmppConnectionManager *xmpp_connection_manager);
 
-void salut_tubes_manager_handle_si_stream_request (SalutTubesManager *self,
-    GibberBytestreamIface *bytestream, TpHandle contact_handle,
-    const gchar *stream_id, GibberXmppStanza *msg);
-
 G_END_DECLS
 
 #endif /* #ifndef __SALUT_TUBES_MANAGER_H__ */
-- 
1.5.6.5