[Telepathy-commits] [telepathy-gabble/master] conn-requests: assert that every channel manager implements GabbleChannelManager

[Simon McVittie]

20080728170444-53eee-ba6b4ba61b1cc3c44cf6264a614027b7f19bebbe.gz
---
 src/conn-requests.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/conn-requests.c b/src/conn-requests.c
index 973ea35..50627da 100644
--- a/src/conn-requests.c
+++ b/src/conn-requests.c
@@ -695,18 +695,16 @@ gabble_conn_requests_init (GabbleConnection *self)
     {
       GObject *factory = g_ptr_array_index (self->channel_factories, i);
 
-      g_assert (TP_IS_CHANNEL_FACTORY_IFACE (factory));
+      g_assert (TP_IS_CHANNEL_FACTORY_IFACE (manager));
 
-      g_signal_connect (factory, "new-channel",
+      g_signal_connect (manager, "new-channel",
           (GCallback) connection_new_channel_cb, self);
       g_signal_connect (factory, "channel-error",
           (GCallback) connection_channel_error_cb, self);
 
-      if (GABBLE_IS_CHANNEL_MANAGER (manager))
-        {
-          g_signal_connect (manager, "channel-closed",
-              (GCallback) manager_channel_closed_cb, self);
-        }
+      /* GabbleChannelManager API */
+      g_signal_connect (manager, "channel-closed",
+          (GCallback) manager_channel_closed_cb, self);
     }
 
   g_assert (self->channel_managers->len == 0);
-- 
1.5.6.3