[Telepathy-commits] [telepathy-gabble/master] remove gabble_private_tubes_factory_tube_created, we can call tp_channel_manager_emit_new_channel directly

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Jan 19 07:25:05 PST 2009


---
 src/private-tubes-factory.c |    7 -------
 src/private-tubes-factory.h |    3 ---
 src/tubes-channel.c         |    4 ++--
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c
index 9ff8112..f64c626 100644
--- a/src/private-tubes-factory.c
+++ b/src/private-tubes-factory.c
@@ -1358,13 +1358,6 @@ gabble_private_tubes_factory_ensure_channel (TpChannelManager *manager,
       request_properties, FALSE);
 }
 
-void
-gabble_private_tubes_factory_tube_created (GabblePrivateTubesFactory *fac,
-                                           GabbleTubeIface *tube)
-{
-  tp_channel_manager_emit_new_channel (fac, TP_EXPORTABLE_CHANNEL (tube), NULL);
-}
-
 static void
 channel_manager_iface_init (gpointer g_iface,
                             gpointer iface_data)
diff --git a/src/private-tubes-factory.h b/src/private-tubes-factory.h
index 58a5564..f04f1ea 100644
--- a/src/private-tubes-factory.h
+++ b/src/private-tubes-factory.h
@@ -76,9 +76,6 @@ void gabble_private_tubes_factory_handle_si_stream_request (
     GabblePrivateTubesFactory *fac, GabbleBytestreamIface *bytestream,
     TpHandle handle, const gchar *stream_id, LmMessage *msg);
 
-void gabble_private_tubes_factory_tube_created (
-    GabblePrivateTubesFactory *fac, GabbleTubeIface *tube);
-
 G_END_DECLS
 
 #endif /* #ifndef __PRIVATE_TUBES_FACTORY_H__ */
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 37ecb6c..7f72b4c 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -1792,8 +1792,8 @@ gabble_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface,
   /* announce the new tube channel we just created (new tube API) */
   if (priv->handle_type == TP_HANDLE_TYPE_CONTACT)
     {
-      gabble_private_tubes_factory_tube_created (
-          priv->conn->private_tubes_factory, tube);
+      tp_channel_manager_emit_new_channel (priv->conn->private_tubes_factory,
+          TP_EXPORTABLE_CHANNEL (tube), NULL);
     }
   else
     {
-- 
1.5.6.5




More information about the Telepathy-commits mailing list