[empathy/gnome-2-34] Always build telepathy-yell and handle Call channels

[Sjoerd Simons <sjoerds src gnome org>]

commit efb08036e134b31339e0e422ef68e6ddef2bf467
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Wed Feb 23 16:19:48 2011 +0000

    Always build telepathy-yell and handle Call channels
    
    Just keep empathy-call optional.

 configure.ac                             |    4 ++--
 libempathy-gtk/empathy-call-utils.c      |   26 +-------------------------
 libempathy-gtk/empathy-new-call-dialog.c |    7 +------
 libempathy/empathy-channel-factory.c     |    6 +-----
 src/empathy.c                            |    4 +---
 5 files changed, 6 insertions(+), 41 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 818d24f..e46dac4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -162,6 +162,8 @@ PKG_CHECK_MODULES(EMPATHY,
    x11
 ])
 
+PKG_CHECK_MODULES(YELL, [telepathy-yell])
+
 PKG_CHECK_MODULES(EMPATHY_AV,
 [
    farsight2-0.10
@@ -175,13 +177,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 3883dad..9800a74 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"
 
@@ -51,7 +49,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,
@@ -70,7 +67,6 @@ empathy_call_create_call_request (const gchar *contact,
       initial_video,
     NULL);
 }
-#endif
 
 GHashTable *
 empathy_call_create_streamed_media_request (const gchar *contact,
@@ -109,7 +105,6 @@ create_streamed_media_channel_cb (GObject *source,
     }
 }
 
-#if HAVE_CALL
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -139,7 +134,6 @@ create_call_channel_cb (GObject *source,
       create_streamed_media_channel_cb,
       NULL);
 }
-#endif
 
 void
 empathy_call_new_with_streams (const gchar *contact,
@@ -148,7 +142,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;
 
@@ -171,21 +164,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, NULL, 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 be266c7..0c609ee 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>
@@ -131,10 +129,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 87cdf7a..7a41716 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);
diff --git a/src/empathy.c b/src/empathy.c
index 970d2b6..325c4d7 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -45,9 +45,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>