diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-19 19:12:09 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-20 15:09:00 +0800 |
| commit | 3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44 (patch) | |
| tree | 74fd79379ca6b7fc518036c5a584680981657d2a /src | |
| parent | 8909adc8fa36c39d26d21bc7e3c3065bb1b6b74d (diff) | |
| download | gsoc2013-empathy-3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44.tar gsoc2013-empathy-3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44.tar.gz gsoc2013-empathy-3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44.tar.bz2 gsoc2013-empathy-3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44.tar.lz gsoc2013-empathy-3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44.tar.xz gsoc2013-empathy-3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44.tar.zst gsoc2013-empathy-3e908f6ba9caefd06a6fbedb7dae55c3a71b9f44.zip | |
Ensure that the connection of the account passed to EmpathyTpChat has capabilities ready
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-manager.c | 8 | ||||
| -rw-r--r-- | 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 ( |