diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-24 00:19:48 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-02-24 01:13:20 +0800 |
| commit | efb08036e134b31339e0e422ef68e6ddef2bf467 (patch) | |
| tree | da073f5b66fcf2a028630b7aa419b63a06554595 /libempathy | |
| parent | 2c751f8089462c379401b930242b0ee244eeaf14 (diff) | |
| download | gsoc2013-empathy-efb08036e134b31339e0e422ef68e6ddef2bf467.tar gsoc2013-empathy-efb08036e134b31339e0e422ef68e6ddef2bf467.tar.gz gsoc2013-empathy-efb08036e134b31339e0e422ef68e6ddef2bf467.tar.bz2 gsoc2013-empathy-efb08036e134b31339e0e422ef68e6ddef2bf467.tar.lz gsoc2013-empathy-efb08036e134b31339e0e422ef68e6ddef2bf467.tar.xz gsoc2013-empathy-efb08036e134b31339e0e422ef68e6ddef2bf467.tar.zst gsoc2013-empathy-efb08036e134b31339e0e422ef68e6ddef2bf467.zip | |
Always build telepathy-yell and handle Call channels
Just keep empathy-call optional.
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 87cdf7af7..7a4171616 100644 --- a/libempathy/empathy-channel-factory.c +++ b/libempathy/empathy-channel-factory.c @@ -25,9 +25,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); @@ -108,13 +106,11 @@ empathy_channel_factory_create_channel ( chan_type = tp_asv_get_string (properties, TP_PROP_CHANNEL_CHANNEL_TYPE); -#if HAVE_CALL 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); |