[Telepathy-commits] [telepathy-salut/master] Fix: Do not assert when the XmppConnection is gone

[Alban Crequy]

---
 src/salut-direct-bytestream-manager.c |    2 --
 src/salut-direct-bytestream-manager.h |    2 +-
 src/tube-stream.c                     |   11 +----------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/salut-direct-bytestream-manager.c b/src/salut-direct-bytestream-manager.c
index 3192fa3..2b258d3 100644
--- a/src/salut-direct-bytestream-manager.c
+++ b/src/salut-direct-bytestream-manager.c
@@ -471,7 +471,6 @@ void salut_direct_bytestream_manager_stop_listen (
 
 GibberBytestreamIface *
 salut_direct_bytestream_manager_new_stream (SalutDirectBytestreamManager *self,
-                                            GibberXmppConnection *connection,
                                             SalutContact *contact,
                                             int portnum)
 {
@@ -483,7 +482,6 @@ salut_direct_bytestream_manager_new_stream (SalutDirectBytestreamManager *self,
   bytestream = g_object_new (GIBBER_TYPE_BYTESTREAM_DIRECT,
       "addresses", salut_contact_get_addresses (contact),
       "state", GIBBER_BYTESTREAM_STATE_LOCAL_PENDING,
-      "self-id", priv->connection->name,
       "peer-id", contact->name,
       "port", portnum,
       NULL);
diff --git a/src/salut-direct-bytestream-manager.h b/src/salut-direct-bytestream-manager.h
index 0309520..87f0e84 100644
--- a/src/salut-direct-bytestream-manager.h
+++ b/src/salut-direct-bytestream-manager.h
@@ -81,6 +81,6 @@ void salut_direct_bytestream_manager_stop_listen (
 /* To be used on the CM-receptor side, to make a new connection */
 GibberBytestreamIface *
 salut_direct_bytestream_manager_new_stream (SalutDirectBytestreamManager *self,
-    GibberXmppConnection *connection, SalutContact *contact, int portnum);
+    SalutContact *contact, int portnum);
 
 #endif /* #ifndef __SALUT_DIRECT_BYTESTREAM_MANAGER_H__*/
diff --git a/src/tube-stream.c b/src/tube-stream.c
index a5d237a..31eaf27 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -562,18 +562,9 @@ start_stream_direct (SalutTubeStream *self,
   else
     {
       GibberBytestreamIface *bytestream;
-      GibberXmppConnection *xmpp_connection = NULL;
-      SalutXmppConnectionManagerRequestConnectionResult result;
-
-      DEBUG ("Called, will request a connection");
-      result = salut_xmpp_connection_manager_request_connection (
-          priv->xmpp_connection_manager, contact, &xmpp_connection, NULL);
-      g_assert (result ==
-          SALUT_XMPP_CONNECTION_MANAGER_REQUEST_CONNECTION_RESULT_DONE);
 
       bytestream = salut_direct_bytestream_manager_new_stream (
-          direct_bytestream_mgr, xmpp_connection,
-          contact, priv->port);
+          direct_bytestream_mgr, contact, priv->port);
 
       if (bytestream == NULL)
         {
-- 
1.5.6.5