[empathy] Drop empathy-av
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Drop empathy-av
- Date: Tue, 21 Feb 2012 15:03:14 +0000 (UTC)
commit ba0a893b1d31cdb234bae72845e840a895b9d62a
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Feb 21 15:18:45 2012 +0100
Drop empathy-av
So long and thanks for all the calling...
https://bugzilla.gnome.org/show_bug.cgi?id=629902
data/Empathy.AudioVideo.client | 21 -
data/Makefile.am | 5 -
....Telepathy.Client.Empathy.AudioVideo.service.in | 3 -
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 | 32 +-
src/empathy-av.c | 172 --
src/empathy-streamed-media-factory.c | 269 --
src/empathy-streamed-media-factory.h | 69 -
src/empathy-streamed-media-handler.c | 903 ------
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 | 3202 --------------------
src/empathy-streamed-media-window.h | 65 -
src/empathy-streamed-media-window.ui | 861 ------
18 files changed, 1 insertions(+), 7068 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 443cdeb..5819434 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -22,7 +22,6 @@ convert_DATA = \
servicefiledir = $(datadir)/dbus-1/services
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
@@ -32,9 +31,6 @@ 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)|" $< > $@
@@ -47,7 +43,6 @@ org.freedesktop.Telepathy.Client.Empathy.FileTransfer.service: org.freedesktop.T
clientfiledir = $(datarootdir)/telepathy/clients
clientfile_DATA = \
Empathy.Chat.client \
- Empathy.AudioVideo.client \
Empathy.Auth.client \
Empathy.Call.client \
Empathy.FileTransfer.client
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index cc288bf..a131587 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -63,7 +63,6 @@ libempathy_headers = \
empathy-tp-contact-factory.h \
empathy-tp-contact-list.h \
empathy-tp-roomlist.h \
- empathy-tp-streamed-media.h \
empathy-types.h \
empathy-utils.h
@@ -104,7 +103,6 @@ libempathy_handwritten_source = \
empathy-tp-contact-factory.c \
empathy-tp-contact-list.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 ca41d9f..2d7f069 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -77,8 +77,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
@@ -100,14 +98,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 8010528..cedac8d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ bin_PROGRAMS = \
libexec_PROGRAMS = \
empathy-auth-client \
- empathy-av \
empathy-chat
empathy_accounts_SOURCES = \
@@ -69,33 +68,6 @@ empathy_debugger_SOURCES = \
empathy-debugger.c \
$(NULL)
-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)
-
empathy_auth_client_SOURCES = \
empathy-auth-client.c \
$(NULL)
@@ -183,8 +155,7 @@ empathy_LDADD = \
check_c_sources = \
$(empathy_handwritten_source) \
- $(empathy_logs_SOURCES) \
- $(empathy_handwritten_av_source)
+ $(empathy_logs_SOURCES)
include $(top_srcdir)/tools/check-coding-style.mk
check-local: check-coding-style
@@ -194,7 +165,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]