aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-02-19 00:45:21 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-08 23:39:57 +0800
commit58942506c55e5fba09a6e85e9e581b80cb62ac27 (patch)
tree42978d1be8f5af42462107f191af3b518948bcc2
parent21a8c4b59d8d69c8b2a1ff801e15766ecf5e74cf (diff)
downloadgsoc2013-empathy-58942506c55e5fba09a6e85e9e581b80cb62ac27.tar
gsoc2013-empathy-58942506c55e5fba09a6e85e9e581b80cb62ac27.tar.gz
gsoc2013-empathy-58942506c55e5fba09a6e85e9e581b80cb62ac27.tar.bz2
gsoc2013-empathy-58942506c55e5fba09a6e85e9e581b80cb62ac27.tar.lz
gsoc2013-empathy-58942506c55e5fba09a6e85e9e581b80cb62ac27.tar.xz
gsoc2013-empathy-58942506c55e5fba09a6e85e9e581b80cb62ac27.tar.zst
gsoc2013-empathy-58942506c55e5fba09a6e85e9e581b80cb62ac27.zip
Initialize telepathy-yell
Conflicts: src/empathy.c
-rw-r--r--src/empathy.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/empathy.c b/src/empathy.c
index c9abac2e8..fb4590fd8 100644
--- 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 ();