diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
| commit | 894b1f315b62499a5d305aff6b937093a20df1a4 (patch) | |
| tree | 8cecdaff46a2ee3360f9e676d11672c388a23082 /src/empathy-call.c | |
| parent | 58574c8dc2e5261d8c89b9a6b6fda41687a386ea (diff) | |
| parent | 1af2b9b657046268d0a44fd2aa588ea281ad1f20 (diff) | |
| download | gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.gz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.bz2 gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.lz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.xz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.zst gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.zip | |
Merge remote-tracking branch 'origin/call1' into master+call
Conflicts:
configure.ac
telepathy-yell
Diffstat (limited to 'src/empathy-call.c')
| -rw-r--r-- | src/empathy-call.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/empathy-call.c b/src/empathy-call.c index 71d9db707..5f45d1ee5 100644 --- 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); |