diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-28 19:07:03 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-01 23:49:06 +0800 |
| commit | 4110a4bc8b8c2a63e94615594eba3b109dcf97e4 (patch) | |
| tree | d06236f38b94639591d0b89f25c19e543a52ccca /data | |
| parent | afb9276b8a497e7b9275fb53abafd0cdb18d55fc (diff) | |
| download | gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.gz gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.bz2 gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.lz gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.xz gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.tar.zst gsoc2013-empathy-4110a4bc8b8c2a63e94615594eba3b109dcf97e4.zip | |
Revert "Drop empathy-av"
This reverts commit ba0a893b1d31cdb234bae72845e840a895b9d62a.
Conflicts:
src/Makefile.am
Diffstat (limited to 'data')
| -rw-r--r-- | data/Empathy.AudioVideo.client | 21 | ||||
| -rw-r--r-- | data/Makefile.am | 5 | ||||
| -rw-r--r-- | data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in | 3 |
3 files changed, 29 insertions, 0 deletions
diff --git a/data/Empathy.AudioVideo.client b/data/Empathy.AudioVideo.client new file mode 100644 index 000000000..ab18a316a --- /dev/null +++ b/data/Empathy.AudioVideo.client @@ -0,0 +1,21 @@ +[org.freedesktop.Telepathy.Client] +Interfaces=org.freedesktop.Telepathy.Client.Handler + +[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 0] +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia +org.freedesktop.Telepathy.Channel.TargetHandleType u=1 + +[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 1] +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia +org.freedesktop.Telepathy.Channel.TargetHandleType u=1 +org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio b=true + +[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 2] +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.StreamedMedia +org.freedesktop.Telepathy.Channel.TargetHandleType u=1 +org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialVideo b=true + +[org.freedesktop.Telepathy.Client.Handler.Capabilities] +org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp=true +org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p=true +org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264=true diff --git a/data/Makefile.am b/data/Makefile.am index 5819434a2..443cdeba4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -22,6 +22,7 @@ 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 @@ -31,6 +32,9 @@ 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)|" $< > $@ @@ -43,6 +47,7 @@ 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/data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in b/data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in new file mode 100644 index 000000000..177f395de --- /dev/null +++ b/data/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.Telepathy.Client.Empathy.AudioVideo +Exec=@libexecdir@/empathy-av |