[Telepathy-commits] [telepathy-gabble/master] GabbleConnection: remove another occurence of assuming the MUC factory is a TpChannelFactoryIface

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Nov 3 11:20:55 PST 2008


20080805153751-53eee-468ee5e3c40fae46fc2aab16076a5024249a6e49.gz
---
 src/connection.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/connection.c b/src/connection.c
index cb32342..7675a22 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -29,8 +29,6 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib-object.h>
 #include <loudmouth/loudmouth.h>
-#include <telepathy-glib/channel-iface.h>
-#include <telepathy-glib/channel-factory-iface.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/errors.h>
@@ -48,6 +46,7 @@
 #include "bytestream-factory.h"
 #include "capabilities.h"
 #include "caps-hash.h"
+#include "channel-manager.h"
 #include "conn-aliasing.h"
 #include "conn-avatars.h"
 #include "conn-presence.h"
@@ -1309,9 +1308,9 @@ _gabble_connection_signal_own_presence (GabbleConnection *self, GError **error)
   lm_message_unref (message);
 
   /* broadcast presence to MUCs */
-  tp_channel_factory_iface_foreach (
-      (TpChannelFactoryIface *) self->muc_factory,
-      (TpChannelFunc) gabble_muc_channel_send_presence, NULL);
+  gabble_channel_manager_foreach_channel (
+      GABBLE_CHANNEL_MANAGER (self->muc_factory),
+      (GabbleExportableChannelFunc) gabble_muc_channel_send_presence, NULL);
 
   return ret;
 }
-- 
1.5.6.5




More information about the Telepathy-commits mailing list