[empathy: 14/99] Initialize telepathy-yell
- From: Emilio Pozuelo Monfort <epm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 14/99] Initialize telepathy-yell
- Date: Thu, 9 Jun 2011 09:50:32 +0000 (UTC)
commit 58942506c55e5fba09a6e85e9e581b80cb62ac27
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date: Fri Feb 18 16:45:21 2011 +0000
Initialize telepathy-yell
Conflicts:
src/empathy.c
src/empathy.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/src/empathy.c b/src/empathy.c
index c9abac2..fb4590f 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 ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]