diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-call-utils.c | 27 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-new-call-dialog.c | 7 | ||||
| -rw-r--r-- | libempathy/empathy-channel-factory.c | 6 | ||||
| -rw-r--r-- | src/empathy.c | 4 |
5 files changed, 6 insertions, 42 deletions
diff --git a/configure.ac b/configure.ac index 3d0437532..1c87649bb 100644 --- a/configure.ac +++ b/configure.ac @@ -172,6 +172,8 @@ PKG_CHECK_MODULES(EMPATHY, gcr-3 >= $GCR_REQUIRED ]) +PKG_CHECK_MODULES(YELL, [telepathy-yell]) + PKG_CHECK_MODULES(EMPATHY_AV, [ farsight2-0.10 @@ -185,13 +187,11 @@ AC_ARG_WITH(call, AC_HELP_STRING([--with-call], [build with Call interface support]),, [with_call=yes]) if test "x$with_call" = "xyes" ; then - PKG_CHECK_MODULES(YELL, [telepathy-yell]) PKG_CHECK_MODULES(EMPATHY_CALL, [ farsight2-0.10 telepathy-farstream ]) - AC_DEFINE(HAVE_CALL, 1, [Define if we have Call interface support]) fi AM_CONDITIONAL(HAVE_CALL, test "x$with_call" = "xyes") diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 5f821dd19..1f3a4fcc0 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -26,9 +26,7 @@ #include <telepathy-glib/telepathy-glib.h> -#if HAVE_CALL - #include <telepathy-yell/telepathy-yell.h> -#endif +#include <telepathy-yell/telepathy-yell.h> #include "empathy-call-utils.h" @@ -53,7 +51,6 @@ show_call_error (GError *error) gtk_widget_show (dialog); } -#if HAVE_CALL GHashTable * empathy_call_create_call_request (const gchar *contact, gboolean initial_audio, @@ -72,7 +69,6 @@ empathy_call_create_call_request (const gchar *contact, initial_video, NULL); } -#endif GHashTable * empathy_call_create_streamed_media_request (const gchar *contact, @@ -111,7 +107,6 @@ create_streamed_media_channel_cb (GObject *source, } } -#if HAVE_CALL static void create_call_channel_cb (GObject *source, GAsyncResult *result, @@ -142,7 +137,6 @@ create_call_channel_cb (GObject *source, create_streamed_media_channel_cb, NULL); } -#endif void empathy_call_new_with_streams (const gchar *contact, @@ -151,7 +145,6 @@ empathy_call_new_with_streams (const gchar *contact, gboolean initial_video, gint64 timestamp) { -#if HAVE_CALL GHashTable *call_request, *streamed_media_request; TpAccountChannelRequest *call_req, *streamed_media_req; @@ -175,22 +168,4 @@ empathy_call_new_with_streams (const gchar *contact, g_hash_table_unref (call_request); g_hash_table_unref (streamed_media_request); g_object_unref (call_req); -#else - GHashTable *request; - TpAccountChannelRequest *req; - - request = empathy_call_create_streamed_media_request (contact, - initial_audio, - initial_video); - - req = tp_account_channel_request_new (account, request, timestamp); - - tp_account_channel_request_create_channel_async (req, - EMPATHY_AV_BUS_NAME, NULL, - create_streamed_media_channel_cb, - NULL); - - g_hash_table_unref (request); - g_object_unref (req); -#endif } 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) != 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); 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> |