Initialize telepathy-yell

Conflicts:

	src/empathy.c

diff --git a/src/empathy.c b/src/empathy.c
index c9abac2e80df02760b693706a91663b16281d267..fb4590fd8ee3682f4a5459f5afb0b6394bfb5ad6 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,6 +44,10 @@
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/interfaces.h>
 
+#if HAVE_CALL
+ #include <telepathy-yell/telepathy-yell.h>
+#endif
+
 #include <telepathy-logger/log-manager.h>
 
 #include <libempathy/empathy-presence-manager.h>
@@ -712,6 +716,8 @@ main (int argc, char *argv[])
   gtk_clutter_init (&argc, &argv);
 #endif
 
+  tpy_cli_init ();
+
   empathy_init ();
   gtk_init (&argc, &argv);
   empathy_gtk_init ();