From 4879bac09bfd5e138b8990baa048b29da97c8e79 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 8 Sep 2011 13:46:10 +0100 Subject: client: stop using the channel factory object This has been superseded by the client factory subclass. Signed-off-by: Jonny Lamb --- telepathy-ytstenut-glib/client.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/telepathy-ytstenut-glib/client.c b/telepathy-ytstenut-glib/client.c index 154a1f9..245e471 100644 --- a/telepathy-ytstenut-glib/client.c +++ b/telepathy-ytstenut-glib/client.c @@ -22,7 +22,6 @@ #include "client.h" #include "channel.h" -#include "channel-factory.h" #include #include @@ -82,7 +81,6 @@ static gint signals[LAST_SIGNAL] = { 0, }; struct _TpYtsClientPrivate { gchar *service_name; TpAccount *account; - TpClientChannelFactory *factory; GQueue incoming_channels; }; @@ -120,7 +118,6 @@ tp_yts_client_init (TpYtsClient *self) TpYtsClientPrivate); g_queue_init (&self->priv->incoming_channels); - self->priv->factory = tp_yts_channel_factory_new (); } static void @@ -134,8 +131,6 @@ tp_yts_client_constructed (GObject *obj) _tp_yts_register_dbus_glib_marshallers (); - tp_base_client_set_channel_factory (client, self->priv->factory); - tp_base_client_set_handler_bypass_approval (client, FALSE); tp_base_client_take_handler_filter (client, tp_asv_new ( @@ -215,8 +210,6 @@ tp_yts_client_dispose (GObject *object) TpYtsClient *self = TP_YTS_CLIENT (object); TpChannel *channel; - tp_clear_object (&self->priv->factory); - while (!g_queue_is_empty (&self->priv->incoming_channels)) { channel = g_queue_pop_head (&self->priv->incoming_channels); @@ -667,9 +660,6 @@ tp_yts_client_request_channel_async (TpYtsClient *self, channel_request = tp_account_channel_request_new (self->priv->account, request_properties, 0); - tp_account_channel_request_set_channel_factory (channel_request, - self->priv->factory); - tp_account_channel_request_create_and_handle_channel_async (channel_request, cancellable, on_channel_request_create_and_handle_channel_returned, res); -- cgit v1.2.3