diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-01-18 23:12:40 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-01-18 23:12:40 +0800 |
| commit | dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f (patch) | |
| tree | ec1372f331b02a2a2101b1c2c25f88b26e8c3ff4 /src | |
| parent | 8eb3671bdebf2b31323d8ad26a0e89f9907cb828 (diff) | |
| parent | 1acf8998707505a367ef27e04730907b56408b3d (diff) | |
| download | gsoc2013-empathy-dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f.tar gsoc2013-empathy-dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f.tar.gz gsoc2013-empathy-dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f.tar.bz2 gsoc2013-empathy-dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f.tar.lz gsoc2013-empathy-dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f.tar.xz gsoc2013-empathy-dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f.tar.zst gsoc2013-empathy-dbb95ed92ec1acc6d6bbf7b4a1dbcaf931070e4f.zip | |
Merge remote branch 'glassrose/Display-typing-icon-in-muc-contacts-list-609419'
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 38c91fa4d..c84b5f447 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -289,9 +289,11 @@ empathy_chat_manager_init (EmpathyChatManager *self) priv->handler = tp_simple_handler_new (dbus, FALSE, FALSE, "Empathy.Chat", FALSE, handle_channels, self, NULL); - /* EmpathyTpChat relies on this feature being prepared */ + /* EmpathyTpChat relies on these features being prepared */ tp_base_client_add_connection_features_varargs (priv->handler, TP_CONNECTION_FEATURE_CAPABILITIES, 0); + tp_base_client_add_channel_features_varargs (priv->handler, + TP_CHANNEL_FEATURE_CHAT_STATES, 0); g_object_unref (dbus); |