Ensure that the connection of the account passed to EmpathyTpChat has capabilities...

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index cfa38ec8420f3c8149bfcf83a69288c814a33ae2..d16be299dd312bfbd73893aa152f0d778047cc05 100644 (file)
--- 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 fdd0672eee8212fa6d1ece31948e3ac807b432f1..0216eeab4a8460a948f5b0fd8038f596544da01f 100644 (file)
--- 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 (