GNOME.org
 

[empathy] remove empathy-av

commit 2d19fc2f3bc163cf742469185d61e667b2dcd084
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed May 2 16:01:24 2012 +0200

    remove empathy-av
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675296

 configure.ac                                   |   19 -
 data/Makefile.am                               |   13 -
 libempathy-gtk/empathy-call-utils.c            |   31 +-
 libempathy/Makefile.am                         |    2 -
 libempathy/empathy-tp-streamed-media.c         |  856 -------
 libempathy/empathy-tp-streamed-media.h         |  113 -
 po/POTFILES.in                                 |    4 -
 src/Makefile.am                                |   33 -
 src/empathy-av.c                               |  169 --
 src/empathy-streamed-media-factory.c           |  270 --
 src/empathy-streamed-media-factory.h           |   69 -
 src/empathy-streamed-media-handler.c           |  921 -------
 src/empathy-streamed-media-handler.h           |  106 -
 src/empathy-streamed-media-window-fullscreen.c |  309 ---
 src/empathy-streamed-media-window-fullscreen.h |   77 -
 src/empathy-streamed-media-window.c            | 3203 ------------------------
 src/empathy-streamed-media-window.h            |   65 -
 src/empathy-streamed-media-window.ui           |  861 -------
 src/ev-sidebar.c                               |  351 ---
 src/ev-sidebar.h                               |   76 -
 20 files changed, 14 insertions(+), 7534 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f2c84a9..1739b6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,24 +214,6 @@ AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
 # -----------------------------------------------------------
-# Build empathy-av?
-# -----------------------------------------------------------
-AC_ARG_ENABLE(empathy-av,
-            AS_HELP_STRING([--enable-empathy-av=@<:@no/yes@:>@],
-            [build empathy-av (legacy call UI)]),,
-            [enable_empathy_av=no])
-if test "x$enable_empathy_av" != "xno" ; then
-   PKG_CHECK_MODULES(EMPATHY_AV,
-   [
-      farstream-0.1
-      telepathy-farstream >= $TELEPATHY_FARSTREAM_REQUIRED
-   ])
-   AC_DEFINE(HAVE_EMPATHY_AV, 1, [Define if you have StreamedMedia channel support])
-   have_empathy_av=yes
-fi
-AM_CONDITIONAL(HAVE_EMPATHY_AV, test "x$have_empathy_av" = "xyes")
-
-# -----------------------------------------------------------
 # evolution-data-server (about-me)
 # -----------------------------------------------------------
 AC_ARG_WITH(eds,
@@ -564,5 +546,4 @@ Configure summary:
 	Nautilus-sendto plugin......:  ${have_nst}
 	GOA MC plugin...............:  ${have_goa}
 	Salut E-D-S support.........:  ${with_eds}
-	empathy-av (legacy).........:  ${enable_empathy_av}
 "
diff --git a/data/Makefile.am b/data/Makefile.am
index 9a2dd88..ffef27b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -29,19 +29,11 @@ servicefile_in_files = \
 	org.freedesktop.Telepathy.Client.Empathy.Call.service.in \
 	org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service.in
 
-if HAVE_EMPATHY_AV
-servicefile_in_files += \
-	org.freedesktop.Telepathy.Client.Empathy.AudioVideo.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
 	$(AM_V_GEN)sed -e "s|[ ]libexecdir[@]|$(libexecdir)|" $< > $@
 
-org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service: org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in
-	$(AM_V_GEN)sed -e "s|[ ]libexecdir[@]|$(libexecdir)|" $< > $@
-
 org.freedesktop.Telepathy.Client.Empathy.Auth.service: org.freedesktop.Telepathy.Client.Empathy.Auth.service.in
 	$(AM_V_GEN)sed -e "s|[ ]libexecdir[@]|$(libexecdir)|" $< > $@
 
@@ -58,11 +50,6 @@ clientfile_DATA = \
 	Empathy.Call.client \
 	Empathy.FileTransfer.client
 
-if HAVE_EMPATHY_AV
-clientfile_DATA += \
-	Empathy.AudioVideo.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 545ec7c..1dca386 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -143,24 +143,24 @@ create_call_channel_cb (GObject *source,
   if (tp_account_channel_request_create_channel_finish (
       TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error))
     {
-      g_clear_object (&streamed_media_req);
+      g_object_unref (streamed_media_req);
       return;
     }
 
   DEBUG ("Failed to create Call channel: %s", error->message);
 
-  if (streamed_media_req != NULL)
+  if (error->code != TP_ERROR_NOT_IMPLEMENTED)
     {
-      DEBUG ("Let's try with an StreamedMedia channel");
-      g_error_free (error);
-      tp_account_channel_request_create_channel_async (streamed_media_req,
-          EMPATHY_AV_BUS_NAME, NULL,
-          create_streamed_media_channel_cb,
-          NULL);
+      show_call_error (error);
       return;
     }
 
-  show_call_error (error);
+  DEBUG ("Let's try with an StreamedMedia channel");
+  g_error_free (error);
+  tp_account_channel_request_create_channel_async (streamed_media_req,
+      EMPATHY_AV_BUS_NAME, NULL,
+      create_streamed_media_channel_cb,
+      NULL);
 }
 
 /* Try to request a Call channel and fallback to StreamedMedia if that fails */
@@ -171,11 +171,8 @@ call_new_with_streams (const gchar *contact,
     gboolean initial_video,
     gint64 timestamp)
 {
-  GHashTable *call_request;
-  TpAccountChannelRequest *call_req, *streamed_media_req = NULL;
-#ifdef HAVE_EMPATHY_AV
-  GHashTable *streamed_media_request;
-#endif
+  GHashTable *call_request, *streamed_media_request;
+  TpAccountChannelRequest *call_req, *streamed_media_req;
 
   /* Call */
   call_request = empathy_call_create_call_request (contact,
@@ -186,7 +183,6 @@ call_new_with_streams (const gchar *contact,
 
   g_hash_table_unref (call_request);
 
-#ifdef HAVE_EMPATHY_AV
   /* StreamedMedia */
   streamed_media_request = empathy_call_create_streamed_media_request (
       contact, initial_audio, initial_video);
@@ -196,10 +192,11 @@ call_new_with_streams (const gchar *contact,
       timestamp);
 
   g_hash_table_unref (streamed_media_request);
-#endif
 
   tp_account_channel_request_create_channel_async (call_req,
-      EMPATHY_CALL_BUS_NAME, NULL, create_call_channel_cb, streamed_media_req);
+      EMPATHY_CALL_BUS_NAME, NULL,
+      create_call_channel_cb,
+      streamed_media_req);
 
   g_object_unref (call_req);
 }
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index abe2eeb..fc1c84a 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -60,7 +60,6 @@ libempathy_headers =				\
 	empathy-tp-chat.h			\
 	empathy-tp-contact-factory.h		\
 	empathy-tp-roomlist.h			\
-	empathy-tp-streamed-media.h		\
 	empathy-types.h				\
 	empathy-utils.h
 
@@ -98,7 +97,6 @@ libempathy_handwritten_source =				\
 	empathy-tp-chat.c				\
 	empathy-tp-contact-factory.c			\
 	empathy-tp-roomlist.c				\
-	empathy-tp-streamed-media.c			\
 	empathy-utils.c
 
 # these are sources that depend on GOA
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 63a49fd..f79cb3f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -79,8 +79,6 @@ src/empathy-about-dialog.c
 src/empathy-accounts-dialog.c
 [type: gettext/glade]src/empathy-accounts-dialog.ui
 src/empathy-auth-client.c
-src/empathy-av.c
-src/empathy-streamed-media-window.c
 [type: gettext/glade]src/empathy-call-window.ui
 src/empathy-chat-window.c
 [type: gettext/glade]src/empathy-chat-window.ui
@@ -102,14 +100,12 @@ src/empathy-preferences.c
 [type: gettext/glade]src/empathy-preferences.ui
 src/empathy-status-icon.c
 [type: gettext/glade]src/empathy-status-icon.ui
-[type: gettext/glade]src/empathy-streamed-media-window.ui
 [type: gettext/glade]src/empathy-call-window-fullscreen.ui
 src/empathy-map-view.c
 [type: gettext/glade]src/empathy-map-view.ui
 src/empathy-debug-window.c
 src/empathy-invite-participant-dialog.c
 src/empathy-accounts.c
-src/empathy-av.c
 src/empathy-debugger.c
 src/empathy-chat.c
 src/empathy-notifications-approver.c
diff --git a/src/Makefile.am b/src/Makefile.am
index dfde205..831e88c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,38 +69,6 @@ empathy_debugger_SOURCES =						\
 	empathy-debugger.c		 				\
 	$(NULL)
 
-if HAVE_EMPATHY_AV
-empathy_av_SOURCES = \
-	empathy-av.c \
-	empathy-audio-sink.c \
-	empathy-audio-sink.h \
-	empathy-audio-src.c \
-	empathy-audio-src.h \
-	empathy-streamed-media-factory.c \
-	empathy-streamed-media-factory.h \
-	empathy-streamed-media-handler.c \
-	empathy-streamed-media-handler.h \
-	empathy-streamed-media-window-fullscreen.c \
-	empathy-streamed-media-window-fullscreen.h \
-	empathy-streamed-media-window.c \
-	empathy-streamed-media-window.h \
-	empathy-video-src.c \
-	empathy-video-src.h \
-	empathy-video-widget.c \
-	empathy-video-widget.h \
-	ev-sidebar.c \
-	ev-sidebar.h \
-	empathy-mic-monitor.c \
-	empathy-mic-monitor.h
-	$(NULL)
-
-empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS)
-empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS) $(LIBM)
-
-libexec_PROGRAMS += empathy-av
-
-endif
-
 empathy_auth_client_SOURCES =						\
 	empathy-sanity-cleaning.c empathy-sanity-cleaning.h \
 	empathy-auth-client.c \
@@ -201,7 +169,6 @@ ui_DATA = 					\
 	empathy-accounts-dialog.ui		\
 	empathy-call-window-fullscreen.ui	\
 	empathy-call-window.ui			\
-	empathy-streamed-media-window.ui	\
 	empathy-chat-window.ui			\
 	empathy-chatrooms-window.ui		\
 	empathy-ft-manager.ui			\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]