[Telepathy-commits] [telepathy-gabble/master] conn-requests: only list channels owned by channel factories, for now

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Aug 20 09:38:27 PDT 2008


20080729163557-53eee-cc781e7399c651836ea3e5e717b0e8127d0d795e.gz
---
 src/conn-requests.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/conn-requests.c b/src/conn-requests.c
index 8d8572b..7418d6e 100644
--- a/src/conn-requests.c
+++ b/src/conn-requests.c
@@ -618,15 +618,16 @@ get_channel_details_foreach (TpChannelIface *chan,
 static GPtrArray *
 conn_requests_get_channel_details (GabbleConnection *self)
 {
-  GPtrArray *details = g_ptr_array_sized_new (self->channel_managers->len * 2);
+  GPtrArray *details = g_ptr_array_sized_new (self->channel_managers->len * 2
+      + self->channel_factories->len * 2);
   guint i;
 
-  for (i = 0; i < self->channel_managers->len; i++)
+  for (i = 0; i < self->channel_factories->len; i++)
     {
-      GabbleChannelManager *manager = GABBLE_CHANNEL_MANAGER (
-          g_ptr_array_index (self->channel_managers, i));
+      TpChannelFactoryIface *factory = TP_CHANNEL_FACTORY_IFACE (
+          g_ptr_array_index (self->channel_factories, i));
 
-      gabble_channel_manager_foreach_channel (manager,
+      tp_channel_factory_iface_foreach (factory,
           get_channel_details_foreach, details);
     }
 
-- 
1.5.6.3




More information about the Telepathy-commits mailing list