From 3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 19 Oct 2010 13:12:09 +0200 Subject: Ensure that the connection of the account passed to EmpathyTpChat has capabilities ready --- src/empathy-chat-manager.c | 8 ++++++-- src/empathy-event-manager.c | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index cfa38ec84..d16be299d 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -255,8 +255,12 @@ empathy_chat_manager_init (EmpathyChatManager *self) } /* Text channels handler */ - priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, "Empathy", FALSE, - handle_channels, self, NULL); + priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, "Empathy", + FALSE, handle_channels, self, NULL); + + /* EmpathyTpChat relies on this feature being prepared */ + tp_base_client_add_connection_features_varargs (priv->handler, + TP_CONNECTION_FEATURE_CAPABILITIES, 0); g_object_unref (dbus); diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index fdd0672ee..0216eeab4 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -1206,6 +1206,10 @@ empathy_event_manager_init (EmpathyEventManager *manager) priv->approver = tp_simple_approver_new (dbus, "Empathy.EventManager", FALSE, approve_channels, manager, NULL); + /* EmpathyTpChat relies on this feature being prepared */ + tp_base_client_add_connection_features_varargs (priv->approver, + TP_CONNECTION_FEATURE_CAPABILITIES, 0); + /* Private text channels */ tp_base_client_take_approver_filter (priv->approver, tp_asv_new ( -- cgit v1.2.3