aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-20 17:02:25 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-10-20 17:02:25 +0800
commitd64a75e1138fb8f871589e7b3eb8285d4b92cdd5 (patch)
treec6b567a48302065722b50e265f2f32b8073334ac /src
parent0b0bc2d054b03840557339661af757083dc00850 (diff)
parentce75052d1555213bf6cdfd99a585e1edb9d86044 (diff)
downloadgsoc2013-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')
-rw-r--r--src/empathy-chat-manager.c8
-rw-r--r--src/empathy-event-manager.c4
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 (