[Telepathy-commits] [telepathy-gabble/master] Fix the conflict after merging gabble-smcv-muc in my branch gabble-alban-request-tube-channel

[Alban Crequy]

20080815141932-a41c0-9a17c461642f8d88f3529096eb7a5591c716cb44.gz
---
 src/connection.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 7675a22..65dc07b 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -209,6 +209,19 @@ _gabble_connection_create_channel_factories (TpBaseConnection *conn)
         "connection", self,
         NULL));
 
+  g_ptr_array_add (self->channel_managers,
+      g_object_new (GABBLE_TYPE_ROOMLIST_MANAGER,
+        "connection", self,
+        NULL));
+
+  self->muc_factory = g_object_new (GABBLE_TYPE_MUC_FACTORY,
+      "connection", self,
+      NULL);
+  g_ptr_array_add (self->channel_managers, self->muc_factory);
+
+  self->private_tubes_factory = gabble_private_tubes_factory_new (self);
+  g_ptr_array_add (self->channel_managers, self->private_tubes_factory);
+
   return channel_factories;
 }
 
-- 
1.5.6.5