[Telepathy-commits] [telepathy-gabble/master] GabbleConnection: treat the roster as a GabbleChannelManager

[Simon McVittie]

20080801155036-53eee-66d1ecedf35a9f7cbe6906a413b23584ae26833d.gz
---
 src/connection.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index 9525b13..1a7ee35 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -190,12 +190,6 @@ _gabble_connection_create_channel_factories (TpBaseConnection *conn)
 
   GPtrArray *channel_factories = g_ptr_array_sized_new (4);
 
-  self->roster = gabble_roster_new (self);
-  g_signal_connect (self->roster, "nickname-update", G_CALLBACK
-      (gabble_conn_aliasing_nickname_updated), self);
-
-  g_ptr_array_add (channel_factories, self->roster);
-
   g_ptr_array_add (channel_factories,
                    g_object_new (GABBLE_TYPE_MEDIA_FACTORY,
                                  "connection", self,
@@ -208,6 +202,11 @@ _gabble_connection_create_channel_factories (TpBaseConnection *conn)
 
   self->channel_managers = g_ptr_array_sized_new (1);
 
+  self->roster = gabble_roster_new (self);
+  g_signal_connect (self->roster, "nickname-update", G_CALLBACK
+      (gabble_conn_aliasing_nickname_updated), self);
+  g_ptr_array_add (self->channel_managers, self->roster);
+
   g_ptr_array_add (self->channel_managers,
       g_object_new (GABBLE_TYPE_IM_FACTORY,
         "connection", self,
-- 
1.5.6.3