[Telepathy-commits] [telepathy-gabble/master] call create_dbus_server in gabble_tube_dbus_accept so gabble_tubes_channel_accept_d_bus_tube doesn't have to call gabble_tube_dbus_listen anymore

[Guillaume Desmottes]

---
 src/tube-dbus.c     |    2 ++
 src/tubes-channel.c |    4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 228d30d..f4ab3f8 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -1549,6 +1549,8 @@ gabble_tube_dbus_accept (GabbleTubeIface *tube,
           NULL);
     }
 
+  create_dbus_server (self, NULL);
+
   return TRUE;
 }
 
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index f4031bb..1c609ab 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -1781,10 +1781,6 @@ gabble_tubes_channel_accept_d_bus_tube (TpSvcChannelTypeTubes *iface,
 
   add_yourself_in_dbus_names (self, id);
 
-  /* The address is known only after we start to listen on the connection,
-   * so we need to listen now. However, connections are accepted only when
-   * the bytestream is fully initialised. See also Bug #13891. */
-  gabble_tube_dbus_listen (GABBLE_TUBE_DBUS (tube));
   g_object_get (tube, "dbus-address", &addr, NULL);
   tp_svc_channel_type_tubes_return_from_accept_d_bus_tube (context, addr);
   g_free (addr);
-- 
1.5.6.5