diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-24 00:19:48 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-09 17:20:05 +0800 |
| commit | 36581b216476e337425ca8737aa7059062a81d99 (patch) | |
| tree | fcfb67cc5f92cb0652ad625e6a226c30480ee8e5 /src/empathy.c | |
| parent | a5e92745d265b5623c045b6cc90164af89b25ded (diff) | |
| download | gsoc2013-empathy-36581b216476e337425ca8737aa7059062a81d99.tar gsoc2013-empathy-36581b216476e337425ca8737aa7059062a81d99.tar.gz gsoc2013-empathy-36581b216476e337425ca8737aa7059062a81d99.tar.bz2 gsoc2013-empathy-36581b216476e337425ca8737aa7059062a81d99.tar.lz gsoc2013-empathy-36581b216476e337425ca8737aa7059062a81d99.tar.xz gsoc2013-empathy-36581b216476e337425ca8737aa7059062a81d99.tar.zst gsoc2013-empathy-36581b216476e337425ca8737aa7059062a81d99.zip | |
Always build telepathy-yell and handle Call channels
Just keep empathy-call optional.
Conflicts:
libempathy-gtk/empathy-call-utils.c
libempathy/empathy-channel-factory.c
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/empathy.c b/src/empathy.c index 4300485c9..6e2b165dc 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -44,9 +44,7 @@ #include <telepathy-glib/connection-manager.h> #include <telepathy-glib/interfaces.h> -#if HAVE_CALL - #include <telepathy-yell/telepathy-yell.h> -#endif +#include <telepathy-yell/telepathy-yell.h> #include <telepathy-logger/log-manager.h> |