[Telepathy-commits] [telepathy-gabble/master] GabbleConnection: use GabbleMediaFactory as a GabbleChannelManager

Simon McVittie simon.mcvittie at collabora.co.uk
Thu Aug 21 08:54:18 PDT 2008


20080801174855-53eee-4751bd12eff623b35b3b372fc08bf1a2ede556df.gz
---
 src/connection.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 1a7ee35..01c9a8b 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -190,11 +190,6 @@ _gabble_connection_create_channel_factories (TpBaseConnection *conn)
 
   GPtrArray *channel_factories = g_ptr_array_sized_new (4);
 
-  g_ptr_array_add (channel_factories,
-                   g_object_new (GABBLE_TYPE_MEDIA_FACTORY,
-                                 "connection", self,
-                                 NULL));
-
   /* Temporary hack for requestotron support - divert the channel factories
    * and channel managers to somewhere under our control */
   self->channel_factories = channel_factories;
@@ -225,6 +220,11 @@ _gabble_connection_create_channel_factories (TpBaseConnection *conn)
   self->private_tubes_factory = gabble_private_tubes_factory_new (self);
   g_ptr_array_add (self->channel_managers, self->private_tubes_factory);
 
+  g_ptr_array_add (self->channel_managers,
+      g_object_new (GABBLE_TYPE_MEDIA_FACTORY,
+        "connection", self,
+        NULL));
+
   return channel_factories;
 }
 
-- 
1.5.6.3




More information about the Telepathy-commits mailing list