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 /libempathy | |
| 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 'libempathy')
| -rw-r--r-- | libempathy/empathy-channel-factory.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libempathy/empathy-channel-factory.c b/libempathy/empathy-channel-factory.c index b2a630ca1..d8b1cd941 100644 --- a/libempathy/empathy-channel-factory.c +++ b/libempathy/empathy-channel-factory.c @@ -28,9 +28,7 @@ #include <telepathy-glib/telepathy-glib.h> -#if HAVE_CALL - #include <telepathy-yell/telepathy-yell.h> -#endif +#include <telepathy-yell/telepathy-yell.h> static void factory_iface_init (gpointer, gpointer); @@ -119,13 +117,11 @@ empathy_channel_factory_create_channel ( return TP_CHANNEL (empathy_tp_chat_new (account, conn, path, properties)); } -#if HAVE_CALL else if (!tp_strdiff (chan_type, TPY_IFACE_CHANNEL_TYPE_CALL)) { return TP_CHANNEL (tpy_call_channel_new (conn, path, properties, error)); } -#endif return tp_client_channel_factory_create_channel ( self->priv->automatic_factory, conn, path, properties, error); |