diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
| commit | 894b1f315b62499a5d305aff6b937093a20df1a4 (patch) | |
| tree | 8cecdaff46a2ee3360f9e676d11672c388a23082 /data | |
| parent | 58574c8dc2e5261d8c89b9a6b6fda41687a386ea (diff) | |
| parent | 1af2b9b657046268d0a44fd2aa588ea281ad1f20 (diff) | |
| download | gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.gz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.bz2 gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.lz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.xz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.zst gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.zip | |
Merge remote-tracking branch 'origin/call1' into master+call
Conflicts:
configure.ac
telepathy-yell
Diffstat (limited to 'data')
| -rw-r--r-- | data/Empathy.Call.client | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/Empathy.Call.client b/data/Empathy.Call.client index 259025d86..468a99625 100644 --- a/data/Empathy.Call.client +++ b/data/Empathy.Call.client @@ -2,20 +2,20 @@ 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.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1 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.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1 org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialAudio b=true +org.freedesktop.Telepathy.Channel.Type.Call1.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.ChannelType s=org.freedesktop.Telepathy.Channel.Type.Call1 org.freedesktop.Telepathy.Channel.TargetHandleType u=1 -org.freedesktop.Telepathy.Channel.Type.Call.DRAFT.InitialVideo b=true +org.freedesktop.Telepathy.Channel.Type.Call1.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 +org.freedesktop.Telepathy.Channel.Type.Call1/ice-udp=true +org.freedesktop.Telepathy.Channel.Type.Call1/gtalk-p2p=true +org.freedesktop.Telepathy.Channel.Type.Call1/video/h264=true |