diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-09 17:28:44 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-09 17:28:44 +0800 |
| commit | 8944f13286ba5293781f2d57980da284cb2aa29d (patch) | |
| tree | 91aa682420a072399f03ac7fb456f62c13064add /data | |
| parent | 981a1377f660a9d1e3660dc66613b993b78486fc (diff) | |
| parent | 3f52e59aa058c16a9ba115398681a16b1e289cd1 (diff) | |
| download | gsoc2013-empathy-8944f13286ba5293781f2d57980da284cb2aa29d.tar gsoc2013-empathy-8944f13286ba5293781f2d57980da284cb2aa29d.tar.gz gsoc2013-empathy-8944f13286ba5293781f2d57980da284cb2aa29d.tar.bz2 gsoc2013-empathy-8944f13286ba5293781f2d57980da284cb2aa29d.tar.lz gsoc2013-empathy-8944f13286ba5293781f2d57980da284cb2aa29d.tar.xz gsoc2013-empathy-8944f13286ba5293781f2d57980da284cb2aa29d.tar.zst gsoc2013-empathy-8944f13286ba5293781f2d57980da284cb2aa29d.zip | |
Merge branch 'call'
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 1 | ||||
| -rw-r--r-- | data/Empathy.Call.client | 21 | ||||
| -rw-r--r-- | data/Makefile.am | 9 | ||||
| -rw-r--r-- | data/org.freedesktop.Telepathy.Client.Empathy.Call.service.in | 3 |
4 files changed, 32 insertions, 2 deletions
diff --git a/data/.gitignore b/data/.gitignore index 9033e3d36..dffae8466 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -4,6 +4,7 @@ org.gnome.Empathy.gschema.valid org.gnome.Empathy.gschema.xml org.freedesktop.Telepathy.Client.Empathy.Chat.service org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service +org.freedesktop.Telepathy.Client.Empathy.Call.service empathy-accounts.desktop empathy-accounts.desktop.in org.freedesktop.Telepathy.Client.Empathy.Auth.service diff --git a/data/Empathy.Call.client b/data/Empathy.Call.client new file mode 100644 index 000000000..259025d86 --- /dev/null +++ b/data/Empathy.Call.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.Call.DRAFT +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.Call.DRAFT +org.freedesktop.Telepathy.Channel.TargetHandleType u=1 +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio b=true + +[org.freedesktop.Telepathy.Client.Handler.HandlerChannelFilter 2] +org.freedesktop.Telepathy.Channel.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call.DRAFT +org.freedesktop.Telepathy.Channel.TargetHandleType u=1 +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo b=true + +[org.freedesktop.Telepathy.Client.Handler.Capabilities] +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/ice-udp=true +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/gtalk-p2p=true +org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/video/h264=true diff --git a/data/Makefile.am b/data/Makefile.am index d7e416a83..24a7fb9d8 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -28,7 +28,8 @@ 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.Auth.service.in \ + org.freedesktop.Telepathy.Client.Empathy.Call.service.in servicefile_DATA = $(servicefile_in_files:.service.in=.service) @@ -41,11 +42,15 @@ org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service: org.freedesktop.Tel org.freedesktop.Telepathy.Client.Empathy.Auth.service: org.freedesktop.Telepathy.Client.Empathy.Auth.service.in $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@ +org.freedesktop.Telepathy.Client.Empathy.Call.service: org.freedesktop.Telepathy.Client.Empathy.Call.service.in + $(AM_V_GEN)sed -e "s|[@]libexecdir[@]|$(libexecdir)|" $< > $@ + clientfiledir = $(datarootdir)/telepathy/clients clientfile_DATA = \ Empathy.Chat.client \ Empathy.AudioVideo.client \ - Empathy.Auth.client + Empathy.Auth.client \ + Empathy.Call.client htmldir = $(datadir)/empathy html_DATA = Template.html diff --git a/data/org.freedesktop.Telepathy.Client.Empathy.Call.service.in b/data/org.freedesktop.Telepathy.Client.Empathy.Call.service.in new file mode 100644 index 000000000..0496d51ad --- /dev/null +++ b/data/org.freedesktop.Telepathy.Client.Empathy.Call.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.freedesktop.Telepathy.Client.Empathy.Call +Exec=@libexecdir@/empathy-call |