Merge remote-tracking branch 'origin/call1' into master+call

[empathy.git] / src / empathy-call.c

diff --git a/src/empathy-call.c b/src/empathy-call.c
index 71d9db707ec3869ba00b0d827556baa8a4739d94..5f45d1ee566b142b3f7df5faa03851179bbd9d0e 100644 (file)
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -36,8 +36,6 @@
 
 #include <telepathy-glib/debug-sender.h>
 
-#include <telepathy-yell/telepathy-yell.h>
-
 #include <libempathy/empathy-client-factory.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -91,7 +89,7 @@ find_window_for_handle (gpointer key,
 static gboolean
 incoming_call_cb (EmpathyCallFactory *factory,
     guint handle,
-    TpyCallChannel *channel,
+    TpCallChannel *channel,
     TpChannelDispatchOperation *dispatch_operation,
     TpAddDispatchOperationContext *context,
     gpointer user_data)
@@ -219,8 +217,6 @@ main (int argc,
 
   g_option_context_free (optcontext);
 
-  tpy_cli_init ();
-
   gtk_clutter_init (&argc, &argv);
   clutter_gst_init (&argc, &argv);