diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-20 17:02:25 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-20 17:02:25 +0800 |
| commit | d64a75e1138fb8f871589e7b3eb8285d4b92cdd5 (patch) | |
| tree | c6b567a48302065722b50e265f2f32b8073334ac /src/empathy-chat-manager.c | |
| parent | 0b0bc2d054b03840557339661af757083dc00850 (diff) | |
| parent | ce75052d1555213bf6cdfd99a585e1edb9d86044 (diff) | |
| download | gsoc2013-empathy-d64a75e1138fb8f871589e7b3eb8285d4b92cdd5.tar gsoc2013-empathy-d64a75e1138fb8f871589e7b3eb8285d4b92cdd5.tar.gz gsoc2013-empathy-d64a75e1138fb8f871589e7b3eb8285d4b92cdd5.tar.bz2 gsoc2013-empathy-d64a75e1138fb8f871589e7b3eb8285d4b92cdd5.tar.lz gsoc2013-empathy-d64a75e1138fb8f871589e7b3eb8285d4b92cdd5.tar.xz gsoc2013-empathy-d64a75e1138fb8f871589e7b3eb8285d4b92cdd5.tar.zst gsoc2013-empathy-d64a75e1138fb8f871589e7b3eb8285d4b92cdd5.zip | |
Merge branch 'kill-dispatcher-632550'
Diffstat (limited to 'src/empathy-chat-manager.c')
| -rw-r--r-- | src/empathy-chat-manager.c | 8 |
1 files changed, 6 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); |