always build empathy-call

https://bugzilla.gnome.org/show_bug.cgi?id=629902

4 files changed, 11 insertions, 82 deletions

diff --git a/configure.ac b/configure.ac
index 5480adb00..504a575e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,42 +204,19 @@ PKG_CHECK_MODULES(EMPATHY_AV,
    telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
 ])
 
+PKG_CHECK_MODULES(EMPATHY_CALL,
+[
+   farstream-0.1
+   telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
+   clutter-1.0 >= $CLUTTER_REQUIRED
+   clutter-gtk-1.0
+   clutter-gst-1.0
+])
+
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
 # -----------------------------------------------------------
-# Call interface
-# -----------------------------------------------------------
-AC_ARG_ENABLE(call,
-            AS_HELP_STRING([--enable-call=@<:@no/yes/auto@:>@],
-            [build with Call interface support]),,
-            [enable_call=auto])
-if test "x$enable_call" != "xno" ; then
-   PKG_CHECK_MODULES(EMPATHY_CALL,
-   [
-      farstream-0.1
-      telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
-      clutter-1.0 >= $CLUTTER_REQUIRED
-      clutter-gtk-1.0
-      clutter-gst-1.0
-   ], have_call="yes", have_call="no" )
-
-   if test "x$have_call" = "xyes"; then
-      AC_DEFINE(HAVE_CALL, 1, [Define if you have Call channel support])
-   fi
-else
-  have_call=no
-fi
-
-if test "x$enable_call" = "xyes" -a "x$have_call" != "xyes"; then
-   AC_MSG_ERROR([Could not find Call handler dependencies:
-
-$EMPATHY_CALL_PKG_ERRORS])
-fi
-AM_CONDITIONAL(HAVE_CALL, test "x$have_call" = "xyes")
-
-
-# -----------------------------------------------------------
 # Call support in tp-logger
 # -----------------------------------------------------------
 AC_ARG_ENABLE(call-logs,
@@ -697,6 +674,5 @@ Configure summary:
 	Nautilus-sendto plugin......:  ${have_nst}
 	GOA MC plugin...............:  ${have_goa}
 	Salut E-D-S support.........:  ${with_eds}
-	Exp. Call channel handler...:  ${have_call}
 	Exp. Call log support.......:  ${have_call_logs}
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index a08ed620d..443cdeba4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,13 +24,9 @@ servicefile_in_files = \
 	org.freedesktop.Telepathy.Client.Empathy.Chat.service.in \
 	org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in \
 	org.freedesktop.Telepathy.Client.Empathy.Auth.service.in \
+	org.freedesktop.Telepathy.Client.Empathy.Call.service.in \
 	org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service.in
 
-if HAVE_CALL
-servicefile_in_files += \
-	org.freedesktop.Telepathy.Client.Empathy.Call.service.in
-endif
-
 servicefile_DATA = $(servicefile_in_files:.service.in=.service)
 
 org.freedesktop.Telepathy.Client.Empathy.Chat.service: org.freedesktop.Telepathy.Client.Empathy.Chat.service.in
@@ -53,13 +49,9 @@ clientfile_DATA = \
 	Empathy.Chat.client \
 	Empathy.AudioVideo.client \
 	Empathy.Auth.client \
+	Empathy.Call.client \
 	Empathy.FileTransfer.client
 
-if HAVE_CALL
-clientfile_DATA += \
-	Empathy.Call.client
-endif
-
 htmldir = $(datadir)/empathy
 html_DATA = \
 	Template.html \
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 4f0185117..1dca38645 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -132,7 +132,6 @@ create_streamed_media_channel_cb (GObject *source,
     }
 }
 
-#ifdef HAVE_CALL
 static void
 create_call_channel_cb (GObject *source,
     GAsyncResult *result,
@@ -202,35 +201,6 @@ call_new_with_streams (const gchar *contact,
   g_object_unref (call_req);
 }
 
-#else /* HAVE_CALL */
-
-static void
-sm_new_with_streams (const gchar *contact,
-    TpAccount *account,
-    gboolean initial_audio,
-    gboolean initial_video,
-    gint64 timestamp)
-{
-  GHashTable *streamed_media_request;
-  TpAccountChannelRequest *streamed_media_req;
-
-  /* StreamedMedia */
-  streamed_media_request = empathy_call_create_streamed_media_request (
-      contact, initial_audio, initial_video);
-
-  streamed_media_req = tp_account_channel_request_new (account,
-      streamed_media_request,
-      timestamp);
-
-  g_hash_table_unref (streamed_media_request);
-
-  tp_account_channel_request_create_channel_async (streamed_media_req,
-      EMPATHY_AV_BUS_NAME, NULL, create_streamed_media_channel_cb, NULL);
-
-  g_object_unref (streamed_media_req);
-}
-#endif /* HAVE_CALL */
-
 void
 empathy_call_new_with_streams (const gchar *contact,
     TpAccount *account,
@@ -238,13 +208,8 @@ empathy_call_new_with_streams (const gchar *contact,
     gboolean initial_video,
     gint64 timestamp)
 {
-#ifdef HAVE_CALL
   call_new_with_streams (contact, account, initial_audio, initial_video,
       timestamp);
-#else
-  sm_new_with_streams (contact, account, initial_audio, initial_video,
-      timestamp);
-#endif
 }
 
 void
diff --git a/src/Makefile.am b/src/Makefile.am
index a2aa31d5b..801052877 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,8 +109,6 @@ empathy_chat_SOURCES =						\
 	gedit-close-button.c gedit-close-button.h \
 	$(NULL)
 
-if HAVE_CALL
-
 libexec_PROGRAMS += empathy-call
 
 empathy_call_SOURCES = \
@@ -153,8 +151,6 @@ empathy_call_SOURCES = \
 empathy_call_CFLAGS = $(EMPATHY_CALL_CFLAGS)
 empathy_call_LDFLAGS = $(EMPATHY_CALL_LIBS)
 
-endif
-
 empathy_handwritten_source = \
 	empathy-about-dialog.c empathy-about-dialog.h			\
 	empathy-chat-window.c empathy-chat-window.h			\