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-gtk/empathy-new-call-dialog.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 'libempathy-gtk/empathy-new-call-dialog.c')
| -rw-r--r-- | libempathy-gtk/empathy-new-call-dialog.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c index 8fd273840..139eb1de5 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -28,9 +28,7 @@ #include <telepathy-glib/interfaces.h> -#if HAVE_CALL #include <telepathy-yell/telepathy-yell.h> -#endif #include <libempathy/empathy-tp-contact-factory.h> #include <libempathy/empathy-contact-manager.h> @@ -133,10 +131,7 @@ conn_prepared_cb (GObject *conn, chan_type = tp_asv_get_string (fixed, TP_PROP_CHANNEL_CHANNEL_TYPE); if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) -#if HAVE_CALL - && tp_strdiff (chan_type, TPY_IFACE_CHANNEL_TYPE_CALL) -#endif - ) + && tp_strdiff (chan_type, TPY_IFACE_CHANNEL_TYPE_CALL)) continue; if (tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != |